more cleanup

.gitignore

@@ -9,4 +9,3 @@
 .cxx
 local.properties
 
-.kotlin/

CONTRIBUTING.md

@@ -1,111 +0,0 @@
-<p align="center">
-  <picture>
-    <source
-      width="256px"
-      media="(prefers-color-scheme: dark)"
-      srcset="assets/revanced-headline/revanced-headline-vertical-dark.svg"
-    >
-    <img 
-      width="256px"
-      src="assets/revanced-headline/revanced-headline-vertical-light.svg"
-    >
-  </picture>
-  <br>
-  <a href="https://revanced.app/">
-       <picture>
-           <source height="24px" media="(prefers-color-scheme: dark)" srcset="assets/revanced-logo/revanced-logo.svg" />
-           <img height="24px" src="assets/revanced-logo/revanced-logo.svg" />
-       </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://github.com/ReVanced">
-       <picture>
-           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
-           <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
-       </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="http://revanced.app/discord">
-       <picture>
-           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
-           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
-       </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://reddit.com/r/revancedapp">
-       <picture>
-           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
-           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
-       </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://t.me/app_revanced">
-      <picture>
-         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
-         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
-      </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://x.com/revancedapp">
-      <picture>
-         <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
-         <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
-      </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://www.youtube.com/@ReVanced">
-      <picture>
-         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
-         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
-     </picture>
-   </a>
-   <br>
-   <br>
-   Continuing the legacy of Vanced
-</p>
-
-# 👋 Contribution guidelines
-
-Welcome to contribution guidelines, this document contains 
-everything you'll need to contribute to ReVanced Manager (and might even possibly apply to our other project like ReVanced Patches!)
-
-There are many ways to contribute like writing docs and code, opening issues, 
-helping people out in our community, translating or sponsoring our project, etc.
-
-## 📖 Resources to help you get started
-
-* The [documentation](/docs/developer/README.md) provides steps to build ReVanced Manager from source
-* Our [backlog](https://github.com/orgs/ReVanced/projects/12) is where we keep track of what we're working on
-* [Issues](https://github.com/ReVanced/revanced-manager/issues) are where we keep track of bugs and feature requests
-
-## 🙏 Submitting a feature request
-
-Features can be requested by opening an issue using the
-[feature request issue template](https://github.com/ReVanced/revanced-manager/issues/new?assignees=&labels=feature-request&projects=&template=feature-issue.yml&title=feat%3A+%3Ctitle%3E).
-
-> [!NOTE]
-> Requests can be accepted or rejected at the discretion of maintainers of ReVanced Manager. 
-> Good motivation has to be provided for a request to be accepted.
-
-## 🐞 Submitting a bug report
-
-If you encounter a bug while using the ReVanced Manager app, open an issue using the
-[bug report issue template](https://github.com/ReVanced/revanced-manager/issues/new?assignees=&labels=bug&projects=&template=bug-issue.yml&title=bug%3A+%3Ctitle%3E).
-
-## 🌐 Submitting translations
-
-You can contribute translations at translate.revanced.app
-
-> [!TIP]
-> * Try to keep the translated text roughly the same length as the original.
-> * Consider opting for gender-neutral words for language with variations of words based on gender.
-
-## 🧑‍💻 Developing for ReVanced Manager
-
-See the guidelines for developing for ReVanced Manager [here](/docs/developer/README.md)
-
-## 🔒 Submitting a vulnerability
-
-See the guideline for reporting security vulnerability [here](/SECURITY.md)
-
-## 🤚 I don't want to do any of that but I want to contribute either way
-
-You can still contribute by spreading positive word about us or if you'd like to sponsor us, checkout https://revanced.app/donate 
-to learn more about how you can sponsor via GitHub, Open Collective, and cryptocurrencies.
-
-❤️ Thank you for considering contributing to ReVanced Manager,
-ReVanced

README.md

@@ -1,104 +1,55 @@
-<p align="center">
+# ReVanced Manager (Compose Rewrite)
-  <picture>
-    <source
-      width="256px"
-      media="(prefers-color-scheme: dark)"
-      srcset="assets/revanced-headline/revanced-headline-vertical-dark.svg"
-    >
-    <img 
-      width="256px"
-      src="assets/revanced-headline/revanced-headline-vertical-light.svg"
-    >
-  </picture>
-  <br>
-  <a href="https://revanced.app/">
-       <picture>
-           <source height="24px" media="(prefers-color-scheme: dark)" srcset="assets/revanced-logo/revanced-logo.svg" />
-           <img height="24px" src="assets/revanced-logo/revanced-logo.svg" />
-       </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://github.com/ReVanced">
-       <picture>
-           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
-           <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
-       </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="http://revanced.app/discord">
-       <picture>
-           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
-           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
-       </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://reddit.com/r/revancedapp">
-       <picture>
-           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
-           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
-       </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://t.me/app_revanced">
-      <picture>
-         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
-         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
-      </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://x.com/revancedapp">
-      <picture>
-         <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
-         <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
-      </picture>
-   </a>&nbsp;&nbsp;&nbsp;
-   <a href="https://www.youtube.com/@ReVanced">
-      <picture>
-         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
-         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
-     </picture>
-   </a>
-   <br>
-   <br>
-   Continuing the legacy of Vanced
-</p>
 
-# 💊 ReVanced Manager
+[![GitHub license](https://img.shields.io/github/license/revanced/revanced-manager)](../../blob/main/LICENSE)
+[![GitHub last commit](https://img.shields.io/github/last-commit/revanced/revanced-manager/compose-dev)](https://github.com/ReVanced/revanced-manager/commits/compose-dev)
+[![GitHub commit activity](https://img.shields.io/github/commit-activity/w/revanced/revanced-manager/compose-dev)](https://github.com/ReVanced/revanced-manager/commits/compose-dev)
 
-[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/ReVanced/revanced-manager/release.yml)](https://github.com/ReVanced/revanced-manager/actions/workflows/release.yml)
+_(Yet another)_ rewrite of the ReVanced Manager using Kotlin and Jetpack Compose.
-[![GPLv3 License](https://img.shields.io/badge/License-GPL%20v3-yellow.svg)](#️-license)
 
-Application to use ReVanced on Android
+## Design system
 
-## ❓ About
+In this rewrite, we are adopting the latest Material Design principles and guidelines by using Material 3 and Material You.
 
-ReVanced Manager is an application that uses [ReVanced Patcher](https://github.com/revanced/revanced-patcher) to patch Android apps.
+Material Design is a design system developed by Google that provides a unified visual language for building beautiful and consistent user interfaces across all platforms and devices. Material You is an extension of Material Design that provides even more customization options for users, making it possible for them to personalize their device and create a unique look and feel.
 
-## 💪 Features
+### Why Material 3?
 
-Some of the features ReVanced Manager provides are:
+* **Consistent design language**
+* **Improved accessibility**
+* **Better user experience**
 
-- 💉 **Patch apps**: Apply any patch of your choice to Android apps
+By using Material 3 and Material You, we are ensuring that the app's user interface is consistent, customizable, accessible, and engaging for our users. This will help to improve the overall user experience and increase user satisfaction with the the manager.
-- 📱 **Portable**: ReVanced Patcher that fits in your pocket
+
-- 🤗 **Simple UI**: Quickly understand the ins and outs of ReVanced Manager
+## Technology stack
-- 🛠️ **Customization**: Configurable API, custom sources, language, signing keystore, theme and more
+
+* Kotlin: Kotlin is a modern and concise programming language that is fully interoperable with Java and provides improved safety, readability, and maintainability compared to Java.
+* Jetpack Compose: Jetpack Compose is a modern UI toolkit for Android development that allows developers to build beautiful and performant user interfaces using declarative programming. It provides a unified and efficient way of building UI that is well-integrated with the Android framework.
+
+## Why Kotlin and Compose?
+
+* **Improved safety:** Kotlin provides improved safety compared to Java, which reduces the likelihood of common programming mistakes that can cause security vulnerabilities or crashes.
+* **Concise and readable code:** Kotlin's concise syntax and expressive type system make the code more readable, which makes it easier for developers to understand and maintain the codebase.
+* **Better performance:** Jetpack Compose uses the power of the Android framework to provide smooth and fast performance, which enhances the user experience.
+* **Modern and efficient UI development:** Jetpack Compose provides a modern and efficient way of building UI, which makes it easier for developers to create beautiful and performant user interfaces.
 
 ## 🔽 Download
 
-You can get the most recent version of ReVanced Manager by downloading from
+You can obtain ReVanced Manager by downloading it from either [revanced.app/download](https://revanced.app/download) or [GitHub Releases](https://github.com/ReVanced/revanced-manager/releases)
-the [ReVanced site](https://revanced.app/download).
 
-Learn how to use ReVanced Manager by following the [documentation](/docs).
+## 📝 Prerequisites
 
-## 📚 Everything else
+For a list of prerequisites, refer to [docs/0_prerequisites.md](docs/0_prerequisites.md)
 
-### 📙 Contributing
+## 🔴 Issues
 
-Thank you for considering contributing to ReVanced Manager.
+For suggestions and bug reports, open an issue [here](https://github.com/revanced/revanced-manager/issues/new/choose).
 
-The [contribution guidelines](CONTRIBUTING.md) provides information you'll need to open an issue, develop for ReVanced Manager and translations.
+## 🌐 Translation
 
-### 📄 Documentation
+[![Crowdin](https://badges.crowdin.net/revanced/localized.svg)](https://crowdin.com/project/revanced)
 
-You can find the documentation for ReVanced Manager [here](/docs).
+We're accepting translations on [Crowdin](https://translate.revanced.app)
 
-## ⚖️ License
+## 🛠️ Building Manager from source
 
-ReVanced Manager is licensed under the GPLv3 license. Please see the [license file](LICENSE) for more information.
+For instructions on how to build ReVanced Manager from source, refer to [docs/4_building.md](docs/4_building.md)
-[tl;dr](https://www.tldrlegal.com/license/gnu-general-public-license-v3-gpl-3) you may copy, distribute and modify ReVanced Manager as long as you track changes/dates in source files.
-Any modifications to ReVanced Manager must also be made available under the GPL, along with build & install instructions.

SECURITY.md

@@ -13,8 +13,8 @@
   <br>
   <a href="https://revanced.app/">
        <picture>
-           <source height="24px" media="(prefers-color-scheme: dark)" srcset="assets/revanced-logo/revanced-logo.svg" />
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="assets/revanced-logo/revanced-logo-round.svg" />
-           <img height="24px" src="assets/revanced-logo/revanced-logo.svg" />
+           <img height="24px" src="assets/revanced-logo/revanced-logo-round.svg" />
        </picture>
    </a>&nbsp;&nbsp;&nbsp;
    <a href="https://github.com/ReVanced">
@@ -64,20 +64,15 @@ This document describes how to report security vulnerabilities for ReVanced Mana
 
 ## 🚨 Reporting a Vulnerability
 
-Please open an issue in our [advisory tracker](https://github.com/ReVanced/revanced-manager/security/advisories/new) 
+Please open an issue in our [advisory tracker](https://github.com/ReVanced/revanced-manager/security/advisories/new) or reach out privately to us on [Discord](https://discord.gg/revanced).
-or reach out privately to us on [Discord](https://discord.gg/revanced).
 
-If a vulnerability is confirmed and accepted, they will be published and 
+If a vulnerability is confirmed and accepted, you can join our [Discord](https://discord.gg/revanced) server to receive a special contributor role.
-you can join our [Discord](https://discord.gg/revanced) server to receive a 
-special contributor role.
 
 ### ⏳ Supported Versions
 
-| Version                                  | Branch        | Supported          |
+| Version | Branch      | Supported          |
-|------------------------------------------|---------------|--------------------|
+| ------- | ------------|------------------- |
-| ![Latest stable release][LatestRelBadge] | `main`        | :white_check_mark: |
+| v1.18.0 | main        | :white_check_mark: |
-| ![Latest version][LatestVerBadge]        | `dev`         | :white_check_mark: |
+| latest  | dev         | :white_check_mark: |
-| ![Latest version][LatestVerBadge]        | `compose-dev` | :white_check_mark: |
+| latest  | compose-dev | :white_check_mark: |
 
-[LatestRelBadge]: https://img.shields.io/github/v/release/ReVanced/revanced-manager?style=for-the-badge "Latest stable release"
-[LatestVerBadge]: https://img.shields.io/badge/version-latest-brightgreen?style=for-the-badge "Latest version"

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

@@ -1,13 +1,10 @@
 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.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.runtime.Composable
@@ -15,7 +12,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.WindowCompat
-import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavController
 import androidx.navigation.compose.NavHost
@@ -33,7 +29,6 @@ import app.revanced.manager.ui.theme.Theme
 import app.revanced.manager.ui.viewmodel.MainViewModel
 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
@@ -49,22 +44,12 @@ class MainActivity : ComponentActivity() {
         installSplashScreen()
 
         val vm: MainViewModel = getActivityViewModel()
+        vm.importLegacySettings(this)
 
         setContent {
-            val launcher = rememberLauncherForActivityResult(
-                ActivityResultContracts.StartActivityForResult(),
-                onResult = vm::applyLegacySettings
-            )
             val theme by vm.prefs.theme.getAsState()
             val dynamicColor by vm.prefs.dynamicColor.getAsState()
 
-            EventEffect(vm.legacyImportActivityFlow) {
-                try {
-                    launcher.launch(it)
-                } catch (_: ActivityNotFoundException) {
-                }
-            }
-
             ReVancedManagerTheme(
                 darkTheme = theme == Theme.SYSTEM && isSystemInDarkTheme() || theme == Theme.DARK,
                 dynamicColor = dynamicColor
@@ -154,20 +139,14 @@ private fun ReVancedManager(vm: MainViewModel) {
                 val parentBackStackEntry = navController.navGraphEntry(it)
                 val data =
                     parentBackStackEntry.getComplexArg<SelectedApplicationInfo.ViewModelParams>()
-                val viewModel =
-                    koinNavViewModel<SelectedAppInfoViewModel>(viewModelStoreOwner = parentBackStackEntry) {
-                        parametersOf(data)
-                    }
 
                 SelectedAppInfoScreen(
                     onBackClick = navController::popBackStack,
-                    onPatchClick = {
+                    onPatchClick = { app, patches, options ->
-                        it.lifecycleScope.launch {
+                        navController.navigateComplex(
-                            navController.navigateComplex(
+                            Patcher,
-                                Patcher,
+                            Patcher.ViewModelParams(app, patches, options)
-                                viewModel.getPatcherParams()
+                        )
-                            )
-                        }
                     },
                     onPatchSelectorClick = { app, patches, options ->
                         navController.navigateComplex(
@@ -179,17 +158,9 @@ private fun ReVancedManager(vm: MainViewModel) {
                             )
                         )
                     },
-                    onRequiredOptions = { app, patches, options ->
+                    vm = koinNavViewModel<SelectedAppInfoViewModel>(viewModelStoreOwner = parentBackStackEntry) {
-                        navController.navigateComplex(
+                        parametersOf(data)
-                            SelectedApplicationInfo.RequiredOptions,
+                    }
-                            SelectedApplicationInfo.PatchesSelector.ViewModelParams(
-                                app,
-                                patches,
-                                options
-                            )
-                        )
-                    },
-                    vm = viewModel
                 )
             }
 
@@ -209,28 +180,6 @@ private fun ReVancedManager(vm: MainViewModel) {
                     vm = koinViewModel { parametersOf(data) }
                 )
             }
-
-            composable<SelectedApplicationInfo.RequiredOptions> {
-                val data =
-                    it.getComplexArg<SelectedApplicationInfo.PatchesSelector.ViewModelParams>()
-                val selectedAppInfoVm = koinNavViewModel<SelectedAppInfoViewModel>(
-                    viewModelStoreOwner = navController.navGraphEntry(it)
-                )
-
-                RequiredOptionsScreen(
-                    onBackClick = navController::popBackStack,
-                    onContinue = { patches, options ->
-                        selectedAppInfoVm.updateConfiguration(patches, options)
-                        it.lifecycleScope.launch {
-                            navController.navigateComplex(
-                                Patcher,
-                                selectedAppInfoVm.getPatcherParams()
-                            )
-                        }
-                    },
-                    vm = koinViewModel { parametersOf(data) }
-                )
-            }
         }
 
         navigation<Settings>(startDestination = Settings.Main) {

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

@@ -12,12 +12,11 @@ import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import app.revanced.manager.R
 import app.revanced.manager.ui.component.haptics.HapticCheckbox
-import app.revanced.manager.util.transparentListItemColors
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun AvailableUpdateDialog(
     onDismiss: () -> Unit,
@@ -71,11 +70,10 @@ fun AvailableUpdateDialog(
                         Text(stringResource(R.string.never_show_again))
                     },
                     leadingContent = {
-                        CompositionLocalProvider(LocalMinimumInteractiveComponentSize provides Dp.Unspecified) {
+                        CompositionLocalProvider(LocalMinimumInteractiveComponentEnforcement provides false) {
                             HapticCheckbox(checked = dontShowAgain, onCheckedChange = { dontShowAgain = it })
                         }
-                    },
+                    }
-                    colors = transparentListItemColors
                 )
             }
         },

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

@@ -1,61 +0,0 @@
-package app.revanced.manager.ui.component
-
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.expandIn
-import androidx.compose.animation.shrinkOut
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Done
-import androidx.compose.material3.FilterChip
-import androidx.compose.material3.FilterChipDefaults
-import androidx.compose.material3.Icon
-import androidx.compose.material3.SelectableChipColors
-import androidx.compose.material3.SelectableChipElevation
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Shape
-
-@Composable
-fun CheckedFilterChip(
-    selected: Boolean,
-    onClick: () -> Unit,
-    label: @Composable () -> Unit,
-    modifier: Modifier = Modifier,
-    enabled: Boolean = true,
-    trailingIcon: @Composable (() -> Unit)? = null,
-    shape: Shape = FilterChipDefaults.shape,
-    colors: SelectableChipColors = FilterChipDefaults.filterChipColors(),
-    elevation: SelectableChipElevation? = FilterChipDefaults.filterChipElevation(),
-    border: BorderStroke? = FilterChipDefaults.filterChipBorder(enabled, selected),
-    interactionSource: MutableInteractionSource? = null
-) {
-    FilterChip(
-        selected = selected,
-        onClick = onClick,
-        label = label,
-        modifier = modifier,
-        enabled = enabled,
-        leadingIcon = {
-            AnimatedVisibility(
-                visible = selected,
-                enter = expandIn(expandFrom = Alignment.CenterStart),
-                exit = shrinkOut(shrinkTowards = Alignment.CenterStart)
-            ) {
-                Icon(
-                    modifier = Modifier.size(FilterChipDefaults.IconSize),
-                    imageVector = Icons.Filled.Done,
-                    contentDescription = null,
-                )
-            }
-        },
-        trailingIcon = trailingIcon,
-        shape = shape,
-        colors = colors,
-        elevation = elevation,
-        border = border,
-        interactionSource = interactionSource
-    )
-}

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

@@ -1,60 +0,0 @@
-package app.revanced.manager.ui.component
-
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.ColumnScope
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.sizeIn
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.SearchBar
-import androidx.compose.material3.SearchBarColors
-import androidx.compose.material3.SearchBarDefaults
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalSoftwareKeyboardController
-import androidx.compose.ui.unit.dp
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun SearchBar(
-    query: String,
-    onQueryChange: (String) -> Unit,
-    expanded: Boolean,
-    onExpandedChange: (Boolean) -> Unit,
-    placeholder: (@Composable () -> Unit)? = null,
-    leadingIcon: @Composable (() -> Unit)? = null,
-    trailingIcon: @Composable (() -> Unit)? = null,
-    content: @Composable ColumnScope.() -> Unit
-) {
-    val colors = SearchBarColors(
-        containerColor = MaterialTheme.colorScheme.surfaceContainerHigh,
-        dividerColor = MaterialTheme.colorScheme.outline
-    )
-    val keyboardController = LocalSoftwareKeyboardController.current
-
-    Box(modifier = Modifier.fillMaxWidth()) {
-        SearchBar(
-            modifier = Modifier.align(Alignment.Center),
-            inputField = {
-                SearchBarDefaults.InputField(
-                    modifier = Modifier.sizeIn(minWidth = 380.dp),
-                    query = query,
-                    onQueryChange = onQueryChange,
-                    onSearch = {
-                        keyboardController?.hide()
-                    },
-                    expanded = expanded,
-                    onExpandedChange = onExpandedChange,
-                    placeholder = placeholder,
-                    leadingIcon = leadingIcon,
-                    trailingIcon = trailingIcon
-                )
-            },
-            expanded = expanded,
-            onExpandedChange = onExpandedChange,
-            colors = colors,
-            content = content
-        )
-    }
-}

app/src/main/java/app/revanced/manager/ui/component/bundle/ImportBundleDialog.kt

@@ -16,7 +16,6 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.Role
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import app.revanced.manager.R
 import app.revanced.manager.ui.component.AlertDialogExtended
@@ -219,7 +218,7 @@ fun ImportBundleStep(
                         ),
                         headlineContent = { Text(stringResource(R.string.auto_update)) },
                         leadingContent = {
-                            CompositionLocalProvider(LocalMinimumInteractiveComponentSize provides Dp.Unspecified) {
+                            CompositionLocalProvider(LocalMinimumInteractiveComponentEnforcement provides false) {
                                 HapticCheckbox(
                                     checked = autoUpdate,
                                     onCheckedChange = {

app/src/main/java/app/revanced/manager/ui/component/patches/OptionFields.kt

@@ -8,7 +8,6 @@ import androidx.compose.foundation.LocalIndication
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -142,19 +141,13 @@ private inline fun <T : Any> WithOptionEditor(
 }
 
 @Composable
-fun <T : Any> OptionItem(
+fun <T : Any> OptionItem(option: Option<T>, value: T?, setValue: (T?) -> Unit) {
-    option: Option<T>,
-    value: T?,
-    setValue: (T?) -> Unit,
-) {
     val editor = remember(option.type, option.presets) {
         @Suppress("UNCHECKED_CAST")
         val baseOptionEditor =
             optionEditors.getOrDefault(option.type, UnknownTypeEditor) as OptionEditor<T>
 
-        if (option.type != typeOf<Boolean>() && option.presets != null) PresetOptionEditor(
+        if (option.type != typeOf<Boolean>() && option.presets != null) PresetOptionEditor(baseOptionEditor)
-            baseOptionEditor
-        )
         else baseOptionEditor
     }
 
@@ -162,15 +155,7 @@ fun <T : Any> OptionItem(
         ListItem(
             modifier = Modifier.clickable(onClick = ::clickAction),
             headlineContent = { Text(option.title) },
-            supportingContent = {
+            supportingContent = { Text(option.description) },
-                Column {
-                    Text(option.description)
-                    if (option.required && value == null) Text(
-                        stringResource(R.string.option_required),
-                        color = MaterialTheme.colorScheme.error
-                    )
-                }
-            },
             trailingContent = { ListItemTrailingContent() }
         )
     }

app/src/main/java/app/revanced/manager/ui/component/settings/SafeguardBooleanItem.kt

@@ -1,54 +0,0 @@
-package app.revanced.manager.ui.component.settings
-
-import androidx.annotation.StringRes
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import app.revanced.manager.domain.manager.base.Preference
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-
-@Composable
-fun SafeguardBooleanItem(
-    modifier: Modifier = Modifier,
-    preference: Preference<Boolean>,
-    coroutineScope: CoroutineScope = rememberCoroutineScope(),
-    @StringRes headline: Int,
-    @StringRes description: Int,
-    @StringRes confirmationText: Int
-) {
-    val value by preference.getAsState()
-    var showSafeguardWarning by rememberSaveable {
-        mutableStateOf(false)
-    }
-
-    if (showSafeguardWarning) {
-        SafeguardConfirmationDialog(
-            onDismiss = { showSafeguardWarning = false },
-            onConfirm = {
-                coroutineScope.launch { preference.update(!value) }
-                showSafeguardWarning = false
-            },
-            body = stringResource(confirmationText)
-        )
-    }
-
-    BooleanItem(
-        modifier = modifier,
-        value = value,
-        onValueChange = {
-            if (it != preference.default) {
-                showSafeguardWarning = true
-            } else {
-                coroutineScope.launch { preference.update(it) }
-            }
-        },
-        headline = headline,
-        description = description
-    )
-}

app/src/main/java/app/revanced/manager/ui/component/settings/SafeguardConfirmationDialog.kt

@@ -1,46 +0,0 @@
-package app.revanced.manager.ui.component.settings
-
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.WarningAmber
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextAlign
-import app.revanced.manager.R
-
-@Composable
-fun SafeguardConfirmationDialog(
-    onDismiss: () -> Unit,
-    onConfirm: () -> Unit,
-    body: String,
-) {
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        confirmButton = {
-            TextButton(onClick = onConfirm) {
-                Text(stringResource(R.string.yes))
-            }
-        },
-        dismissButton = {
-            TextButton(onClick = onDismiss) {
-                Text(stringResource(R.string.no))
-            }
-        },
-        icon = {
-            Icon(Icons.Outlined.WarningAmber, null)
-        },
-        title = {
-            Text(
-                text = stringResource(id = R.string.warning),
-                style = MaterialTheme.typography.headlineSmall.copy(textAlign = TextAlign.Center)
-            )
-        },
-        text = {
-            Text(body)
-        }
-    )
-}

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

@@ -34,23 +34,20 @@ data class BundleInfo(
     }
 
     companion object Extensions {
-        inline fun Iterable<BundleInfo>.toPatchSelection(
+        inline fun Iterable<BundleInfo>.toPatchSelection(allowUnsupported: Boolean, condition: (Int, PatchInfo) -> Boolean): PatchSelection = this.associate { bundle ->
-            allowUnsupported: Boolean,
+                val patches =
-            condition: (Int, PatchInfo) -> Boolean
+                    bundle.patchSequence(allowUnsupported)
-        ): PatchSelection = this.associate { bundle ->
+                        .mapNotNullTo(mutableSetOf()) { patch ->
-            val patches =
+                            patch.name.takeIf {
-                bundle.patchSequence(allowUnsupported)
+                                condition(
-                    .mapNotNullTo(mutableSetOf()) { patch ->
+                                    bundle.uid,
-                        patch.name.takeIf {
+                                    patch
-                            condition(
+                                )
-                                bundle.uid,
+                            }
-                                patch
-                            )
                         }
-                    }
 
-            bundle.uid to patches
+                bundle.uid to patches
-        }
+            }
 
         fun PatchBundleRepository.bundleInfoFlow(packageName: String, version: String?) =
             sources.flatMapLatestAndCombine(
@@ -81,28 +78,6 @@ data class BundleInfo(
                     BundleInfo(source.getName(), source.uid, supported, unsupported, universal)
                 }
             }
-
-        /**
-         * Algorithm for determining whether all required options have been set.
-         */
-        inline fun Iterable<BundleInfo>.requiredOptionsSet(
-            crossinline isSelected: (BundleInfo, PatchInfo) -> Boolean,
-            crossinline optionsForPatch: (BundleInfo, PatchInfo) -> Map<String, Any?>?
-        ) = all bundle@{ bundle ->
-            bundle
-                .all
-                .filter { isSelected(bundle, it) }
-                .all patch@{
-                    if (it.options.isNullOrEmpty()) return@patch true
-                    val opts by lazy { optionsForPatch(bundle, it).orEmpty() }
-
-                    it.options.all option@{ option ->
-                        if (!option.required || option.default != null) return@option true
-
-                        option.key in opts
-                    }
-                }
-        }
     }
 }
 

app/src/main/java/app/revanced/manager/ui/model/navigation/Nav.kt

@@ -42,9 +42,6 @@ data object SelectedApplicationInfo : ComplexParameter<SelectedApplicationInfo.V
             val options: @RawValue Options,
         ) : Parcelable
     }
-
-    @Serializable
-    data object RequiredOptions : ComplexParameter<PatchesSelector.ViewModelParams>
 }
 
 @Serializable

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

@@ -109,6 +109,7 @@ fun DashboardScreen(
         )
     }
 
+    val context = LocalContext.current
     var showAndroid11Dialog by rememberSaveable { mutableStateOf(false) }
     val installAppsPermissionLauncher =
         rememberLauncherForActivityResult(RequestInstallAppsContract) { granted ->
@@ -120,7 +121,7 @@ fun DashboardScreen(
             showAndroid11Dialog = false
         },
         onContinue = {
-            installAppsPermissionLauncher.launch(androidContext.packageName)
+            installAppsPermissionLauncher.launch(context.packageName)
         }
     )
 
@@ -238,7 +239,6 @@ fun DashboardScreen(
                 }
             }
 
-            val showBatteryOptimizationsWarning by vm.showBatteryOptimizationsWarningFlow.collectAsStateWithLifecycle(false)
             Notifications(
                 if (!Aapt.supportsDevice()) {
                     {
@@ -250,7 +250,7 @@ fun DashboardScreen(
                         )
                     }
                 } else null,
-                if (showBatteryOptimizationsWarning) {
+                if (vm.showBatteryOptimizationsWarning) {
                     {
                         NotificationCard(
                             isWarning = true,

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

@@ -1,50 +1,16 @@
 package app.revanced.manager.ui.screen
 
-import androidx.compose.animation.AnimatedContent
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.core.EaseInOut
-import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.animation.core.tween
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.animation.slideInHorizontally
-import androidx.compose.animation.slideOutHorizontally
-import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.ExperimentalLayoutApi
-import androidx.compose.foundation.layout.FlowRow
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.automirrored.outlined.HelpOutline
-import androidx.compose.material.icons.filled.Close
+import androidx.compose.material.icons.outlined.*
-import androidx.compose.material.icons.outlined.FilterList
+import androidx.compose.material3.*
-import androidx.compose.material.icons.outlined.Restore
-import androidx.compose.material.icons.outlined.Save
-import androidx.compose.material.icons.outlined.Settings
-import androidx.compose.material.icons.outlined.WarningAmber
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.ListItem
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.ModalBottomSheet
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.ScrollableTabRow
-import androidx.compose.material3.SmallFloatingActionButton
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
@@ -53,10 +19,8 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
-import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
@@ -67,24 +31,24 @@ import app.revanced.manager.R
 import app.revanced.manager.patcher.patch.Option
 import app.revanced.manager.patcher.patch.PatchInfo
 import app.revanced.manager.ui.component.AppTopBar
-import app.revanced.manager.ui.component.CheckedFilterChip
 import app.revanced.manager.ui.component.LazyColumnWithScrollbar
 import app.revanced.manager.ui.component.SafeguardDialog
-import app.revanced.manager.ui.component.SearchBar
+import app.revanced.manager.ui.component.SearchView
 import app.revanced.manager.ui.component.haptics.HapticCheckbox
 import app.revanced.manager.ui.component.haptics.HapticExtendedFloatingActionButton
 import app.revanced.manager.ui.component.haptics.HapticTab
 import app.revanced.manager.ui.component.patches.OptionItem
 import app.revanced.manager.ui.viewmodel.PatchesSelectorViewModel
-import app.revanced.manager.ui.viewmodel.PatchesSelectorViewModel.Companion.SHOW_UNSUPPORTED
+import app.revanced.manager.ui.viewmodel.PatchesSelectorViewModel.Companion.SHOW_SUPPORTED
 import app.revanced.manager.ui.viewmodel.PatchesSelectorViewModel.Companion.SHOW_UNIVERSAL
+import app.revanced.manager.ui.viewmodel.PatchesSelectorViewModel.Companion.SHOW_UNSUPPORTED
 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.launch
 
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun PatchesSelectorScreen(
     onSave: (PatchSelection?, Options) -> Unit,
@@ -99,17 +63,20 @@ fun PatchesSelectorScreen(
         bundles.size
     }
     val composableScope = rememberCoroutineScope()
-    val (query, setQuery) = rememberSaveable {
+    var search: String? by rememberSaveable {
-        mutableStateOf("")
+        mutableStateOf(null)
-    }
-    val (searchExpanded, setSearchExpanded) = rememberSaveable {
-        mutableStateOf(false)
     }
     var showBottomSheet by rememberSaveable { mutableStateOf(false) }
-    val showSaveButton by remember {
+    val showPatchButton by remember {
         derivedStateOf { vm.selectionIsValid(bundles) }
     }
 
+    val availablePatchCount by remember {
+        derivedStateOf {
+            bundles.sumOf { it.patchCount }
+        }
+    }
+
     val defaultPatchSelectionCount by vm.defaultSelectionCount
         .collectAsStateWithLifecycle(initialValue = 0)
 
@@ -141,22 +108,27 @@ fun PatchesSelectorScreen(
                     style = MaterialTheme.typography.titleMedium
                 )
 
-                FlowRow(
+                Row(
                     modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.spacedBy(8.dp),
+                    horizontalArrangement = Arrangement.spacedBy(5.dp)
-                    verticalArrangement = Arrangement.spacedBy(12.dp)
                 ) {
-                    CheckedFilterChip(
+                    FilterChip(
-                        selected = vm.filter and SHOW_UNSUPPORTED == 0,
+                        selected = vm.filter and SHOW_SUPPORTED != 0,
-                        onClick = { vm.toggleFlag(SHOW_UNSUPPORTED) },
+                        onClick = { vm.toggleFlag(SHOW_SUPPORTED) },
                         label = { Text(stringResource(R.string.supported)) }
                     )
 
-                    CheckedFilterChip(
+                    FilterChip(
                         selected = vm.filter and SHOW_UNIVERSAL != 0,
                         onClick = { vm.toggleFlag(SHOW_UNIVERSAL) },
                         label = { Text(stringResource(R.string.universal)) },
                     )
+
+                    FilterChip(
+                        selected = vm.filter and SHOW_UNSUPPORTED != 0,
+                        onClick = { vm.toggleFlag(SHOW_UNSUPPORTED) },
+                        label = { Text(stringResource(R.string.unsupported)) },
+                    )
                 }
             }
         }
@@ -203,21 +175,20 @@ fun PatchesSelectorScreen(
     fun LazyListScope.patchList(
         uid: Int,
         patches: List<PatchInfo>,
-        visible: Boolean,
+        filterFlag: Int,
         supported: Boolean,
         header: (@Composable () -> Unit)? = null
     ) {
-        if (patches.isNotEmpty() && visible) {
+        if (patches.isNotEmpty() && (vm.filter and filterFlag) != 0 || vm.filter == 0) {
             header?.let {
-                item(contentType = 0) {
+                item {
                     it()
                 }
             }
 
             items(
                 items = patches,
-                key = { it.name },
+                key = { it.name }
-                contentType = { 1 }
             ) { patch ->
                 PatchItem(
                     patch = patch,
@@ -251,142 +222,103 @@ fun PatchesSelectorScreen(
         }
     }
 
-    Scaffold(
+    search?.let { query ->
-        topBar = {
+        SearchView(
-            SearchBar(
+            query = query,
-                query = query,
+            onQueryChange = { search = it },
-                onQueryChange = setQuery,
+            onActiveChange = { if (!it) search = null },
-                expanded = searchExpanded,
+            placeholder = { Text(stringResource(R.string.search_patches)) }
-                onExpandedChange = setSearchExpanded,
+        ) {
-                placeholder = {
+            val bundle = bundles[pagerState.currentPage]
-                    Text(stringResource(R.string.search_patches))
+
-                },
+            LazyColumnWithScrollbar(
-                leadingIcon = {
+                modifier = Modifier.fillMaxSize()
-                    val rotation by animateFloatAsState(
-                        targetValue = if (searchExpanded) 360f else 0f,
-                        animationSpec = tween(durationMillis = 400, easing = EaseInOut),
-                        label = "SearchBar back button"
-                    )
-                    IconButton(
-                        onClick = {
-                            if (searchExpanded) {
-                                setSearchExpanded(false)
-                            } else {
-                                onBackClick()
-                            }
-                        }
-                    ) {
-                        Icon(
-                            modifier = Modifier.rotate(rotation),
-                            imageVector = Icons.AutoMirrored.Filled.ArrowBack,
-                            contentDescription = stringResource(R.string.back)
-                        )
-                    }
-                },
-                trailingIcon = {
-                    AnimatedContent(
-                        targetState = searchExpanded,
-                        label = "Filter/Clear",
-                        transitionSpec = { fadeIn() togetherWith fadeOut() }
-                    ) { searchExpanded ->
-                        if (searchExpanded) {
-                            IconButton(
-                                onClick = { setQuery("") },
-                                enabled = query.isNotEmpty()
-                            ) {
-                                Icon(
-                                    imageVector = Icons.Filled.Close,
-                                    contentDescription = stringResource(R.string.clear)
-                                )
-                            }
-                        } else {
-                            IconButton(onClick = { showBottomSheet = true }) {
-                                Icon(
-                                    imageVector = Icons.Outlined.FilterList,
-                                    contentDescription = stringResource(R.string.more)
-                                )
-                            }
-                        }
-                    }
-                }
             ) {
-                val bundle = bundles[pagerState.currentPage]
+                fun List<PatchInfo>.searched() = filter {
-
+                    it.name.contains(query, true)
-                LazyColumnWithScrollbar(
-                    modifier = Modifier.fillMaxSize()
-                ) {
-                    fun List<PatchInfo>.searched() = filter {
-                        it.name.contains(query, true)
-                    }
-
-                    patchList(
-                        uid = bundle.uid,
-                        patches = bundle.supported.searched(),
-                        visible = true,
-                        supported = true
-                    )
-                    patchList(
-                        uid = bundle.uid,
-                        patches = bundle.universal.searched(),
-                        visible = vm.filter and SHOW_UNIVERSAL != 0,
-                        supported = true
-                    ) {
-                        ListHeader(
-                            title = stringResource(R.string.universal_patches),
-                        )
-                    }
-
-                    patchList(
-                        uid = bundle.uid,
-                        patches = bundle.unsupported.searched(),
-                        visible = vm.filter and SHOW_UNSUPPORTED != 0,
-                        supported = vm.allowIncompatiblePatches
-                    ) {
-                        ListHeader(
-                            title = stringResource(R.string.unsupported_patches),
-                            onHelpClick = { showUnsupportedPatchesDialog = true }
-                        )
-                    }
                 }
-            }
-        },
-        floatingActionButton = {
-            if (!showSaveButton) return@Scaffold
 
-            AnimatedVisibility(
+                patchList(
-                visible = !searchExpanded,
+                    uid = bundle.uid,
-                enter = slideInHorizontally { it } + fadeIn(),
+                    patches = bundle.supported.searched(),
-                exit = slideOutHorizontally { it } + fadeOut()
+                    filterFlag = SHOW_SUPPORTED,
-            ) {
+                    supported = true
-                Column(
+                )
-                    horizontalAlignment = Alignment.End,
+                patchList(
-                    verticalArrangement = Arrangement.spacedBy(4.dp)
+                    uid = bundle.uid,
+                    patches = bundle.universal.searched(),
+                    filterFlag = SHOW_UNIVERSAL,
+                    supported = true
                 ) {
-                    SmallFloatingActionButton(
+                    ListHeader(
-                        onClick = vm::reset,
+                        title = stringResource(R.string.universal_patches),
-                        containerColor = MaterialTheme.colorScheme.tertiaryContainer
+                    )
-                    ) {
+                }
-                        Icon(Icons.Outlined.Restore, stringResource(R.string.reset))
+
-                    }
+                if (!vm.allowIncompatiblePatches) return@LazyColumnWithScrollbar
-                    HapticExtendedFloatingActionButton(
+                patchList(
-                        text = { Text(stringResource(R.string.save_with_count, selectedPatchCount)) },
+                    uid = bundle.uid,
-                        icon = {
+                    patches = bundle.unsupported.searched(),
-                            Icon(
+                    filterFlag = SHOW_UNSUPPORTED,
-                                imageVector = Icons.Outlined.Save,
+                    supported = true
-                                contentDescription = stringResource(R.string.save)
+                ) {
-                            )
+                    ListHeader(
-                        },
+                        title = stringResource(R.string.unsupported_patches),
-                        expanded = patchLazyListStates.getOrNull(pagerState.currentPage)?.isScrollingUp ?: true,
+                        onHelpClick = { showUnsupportedPatchesDialog = true }
-                        onClick = {
-                            onSave(vm.getCustomSelection(), vm.getOptions())
-                        }
                     )
                 }
             }
         }
+    }
+
+    Scaffold(
+        topBar = {
+            AppTopBar(
+                title = stringResource(
+                    R.string.patches_selected,
+                    selectedPatchCount,
+                    availablePatchCount
+                ),
+                onBackClick = onBackClick,
+                actions = {
+                    IconButton(onClick = vm::reset) {
+                        Icon(Icons.Outlined.Restore, stringResource(R.string.reset))
+                    }
+                    IconButton(onClick = { showBottomSheet = true }) {
+                        Icon(Icons.Outlined.FilterList, stringResource(R.string.more))
+                    }
+                    IconButton(
+                        onClick = {
+                            search = ""
+                        }
+                    ) {
+                        Icon(Icons.Outlined.Search, stringResource(R.string.search))
+                    }
+                }
+            )
+        },
+        floatingActionButton = {
+            if (!showPatchButton) return@Scaffold
+
+            HapticExtendedFloatingActionButton(
+                text = { Text(stringResource(R.string.save)) },
+                icon = {
+                    Icon(
+                        Icons.Outlined.Save,
+                        stringResource(R.string.save)
+                    )
+                },
+                expanded = patchLazyListStates.getOrNull(pagerState.currentPage)?.isScrollingUp
+                    ?: true,
+                onClick = {
+                    // TODO: only allow this if all required options have been set.
+                    onSave(vm.getCustomSelection(), vm.getOptions())
+                }
+            )
+        }
     ) { paddingValues ->
         Column(
-            modifier = Modifier
+            Modifier
                 .fillMaxSize()
                 .padding(paddingValues)
         ) {
@@ -428,13 +360,13 @@ fun PatchesSelectorScreen(
                         patchList(
                             uid = bundle.uid,
                             patches = bundle.supported,
-                            visible = true,
+                            filterFlag = SHOW_SUPPORTED,
                             supported = true
                         )
                         patchList(
                             uid = bundle.uid,
                             patches = bundle.universal,
-                            visible = vm.filter and SHOW_UNIVERSAL != 0,
+                            filterFlag = SHOW_UNIVERSAL,
                             supported = true
                         ) {
                             ListHeader(
@@ -444,7 +376,7 @@ fun PatchesSelectorScreen(
                         patchList(
                             uid = bundle.uid,
                             patches = bundle.unsupported,
-                            visible = vm.filter and SHOW_UNSUPPORTED != 0,
+                            filterFlag = SHOW_UNSUPPORTED,
                             supported = vm.allowIncompatiblePatches
                         ) {
                             ListHeader(
@@ -532,7 +464,7 @@ private fun PatchItem(
 )
 
 @Composable
-fun ListHeader(
+private fun ListHeader(
     title: String,
     onHelpClick: (() -> Unit)? = null
 ) {

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

@@ -1,158 +0,0 @@
-package app.revanced.manager.ui.screen
-
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyListState
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.pager.HorizontalPager
-import androidx.compose.foundation.pager.rememberPagerState
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.AutoFixHigh
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.ScrollableTabRow
-import androidx.compose.material3.Text
-import androidx.compose.material3.surfaceColorAtElevation
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.derivedStateOf
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import app.revanced.manager.R
-import app.revanced.manager.patcher.patch.Option
-import app.revanced.manager.ui.component.AppTopBar
-import app.revanced.manager.ui.component.LazyColumnWithScrollbar
-import app.revanced.manager.ui.component.haptics.HapticExtendedFloatingActionButton
-import app.revanced.manager.ui.component.haptics.HapticTab
-import app.revanced.manager.ui.component.patches.OptionItem
-import app.revanced.manager.ui.model.BundleInfo.Extensions.requiredOptionsSet
-import app.revanced.manager.ui.viewmodel.PatchesSelectorViewModel
-import app.revanced.manager.util.Options
-import app.revanced.manager.util.PatchSelection
-import app.revanced.manager.util.isScrollingUp
-import kotlinx.coroutines.launch
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun RequiredOptionsScreen(
-    onContinue: (PatchSelection?, Options) -> Unit,
-    onBackClick: () -> Unit,
-    vm: PatchesSelectorViewModel
-) {
-    val list by vm.requiredOptsPatches.collectAsStateWithLifecycle(emptyList())
-
-    val pagerState = rememberPagerState(
-        initialPage = 0,
-        initialPageOffsetFraction = 0f
-    ) {
-        list.size
-    }
-    val patchLazyListStates = remember(list) { List(list.size, ::LazyListState) }
-    val bundles by vm.bundlesFlow.collectAsStateWithLifecycle(emptyList())
-    val showContinueButton by remember {
-        derivedStateOf {
-            bundles.requiredOptionsSet(
-                isSelected = { bundle, patch -> vm.isSelected(bundle.uid, patch) },
-                optionsForPatch = { bundle, patch -> vm.getOptions(bundle.uid, patch) }
-            )
-        }
-    }
-    val composableScope = rememberCoroutineScope()
-
-    Scaffold(
-        topBar = {
-            AppTopBar(
-                title = stringResource(R.string.required_options_screen),
-                onBackClick = onBackClick
-            )
-        },
-        floatingActionButton = {
-            if (!showContinueButton) return@Scaffold
-
-            HapticExtendedFloatingActionButton(
-                text = { Text(stringResource(R.string.patch)) },
-                icon = {
-                    Icon(
-                        Icons.Default.AutoFixHigh,
-                        stringResource(R.string.patch)
-                    )
-                },
-                expanded = patchLazyListStates.getOrNull(pagerState.currentPage)?.isScrollingUp
-                    ?: true,
-                onClick = {
-                    onContinue(vm.getCustomSelection(), vm.getOptions())
-                }
-            )
-        }
-    ) { paddingValues ->
-        Column(
-            Modifier
-                .fillMaxSize()
-                .padding(paddingValues)
-        ) {
-            if (list.isEmpty()) return@Column
-            else if (list.size > 1) ScrollableTabRow(
-                selectedTabIndex = pagerState.currentPage,
-                containerColor = MaterialTheme.colorScheme.surfaceColorAtElevation(3.0.dp)
-            ) {
-                list.forEachIndexed { index, (bundle, _) ->
-                    HapticTab(
-                        selected = pagerState.currentPage == index,
-                        onClick = {
-                            composableScope.launch {
-                                pagerState.animateScrollToPage(
-                                    index
-                                )
-                            }
-                        },
-                        text = { Text(bundle.name) },
-                        selectedContentColor = MaterialTheme.colorScheme.primary,
-                        unselectedContentColor = MaterialTheme.colorScheme.onSurfaceVariant
-                    )
-                }
-            }
-
-            HorizontalPager(
-                state = pagerState,
-                userScrollEnabled = true,
-                pageContent = { index ->
-                    // Avoid crashing if the lists have not been fully initialized yet.
-                    if (index > list.lastIndex || list.size != patchLazyListStates.size) return@HorizontalPager
-                    val (bundle, patches) = list[index]
-
-                    LazyColumnWithScrollbar(
-                        modifier = Modifier.fillMaxSize(),
-                        state = patchLazyListStates[index]
-                    ) {
-                        items(patches, key = { it.name }) {
-                            ListHeader(it.name)
-
-                            val values = vm.getOptions(bundle.uid, it)
-                            it.options?.forEach { option ->
-                                val key = option.key
-                                val value =
-                                    if (values == null || key !in values) option.default else values[key]
-
-                                @Suppress("UNCHECKED_CAST")
-                                OptionItem(
-                                    option = option as Option<Any>,
-                                    value = value,
-                                    setValue = { new ->
-                                        vm.setOption(bundle.uid, it, key, new)
-                                    }
-                                )
-                            }
-                        }
-                    }
-                }
-            )
-        }
-    }
-}

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

@@ -14,9 +14,9 @@ import androidx.compose.material.icons.automirrored.outlined.ArrowRight
 import androidx.compose.material.icons.filled.AutoFixHigh
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
@@ -32,6 +32,7 @@ import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.ColumnWithScrollbar
 import app.revanced.manager.ui.component.LoadingIndicator
 import app.revanced.manager.ui.component.haptics.HapticExtendedFloatingActionButton
+import app.revanced.manager.ui.model.BundleInfo.Extensions.bundleInfoFlow
 import app.revanced.manager.ui.model.SelectedApp
 import app.revanced.manager.ui.viewmodel.SelectedAppInfoViewModel
 import app.revanced.manager.util.EventEffect
@@ -40,14 +41,12 @@ import app.revanced.manager.util.PatchSelection
 import app.revanced.manager.util.enabled
 import app.revanced.manager.util.toast
 import app.revanced.manager.util.transparentListItemColors
-import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun SelectedAppInfoScreen(
     onPatchSelectorClick: (SelectedApp, PatchSelection?, Options) -> Unit,
-    onRequiredOptions: (SelectedApp, PatchSelection?, Options) -> Unit,
+    onPatchClick: (SelectedApp, PatchSelection, Options) -> Unit,
-    onPatchClick: () -> Unit,
     onBackClick: () -> Unit,
     vm: SelectedAppInfoViewModel
 ) {
@@ -55,14 +54,20 @@ fun SelectedAppInfoScreen(
 
     val packageName = vm.selectedApp.packageName
     val version = vm.selectedApp.version
-    val bundles by vm.bundleInfoFlow.collectAsStateWithLifecycle(emptyList())
+    val bundles by remember(packageName, version) {
+        vm.bundlesRepo.bundleInfoFlow(packageName, version)
+    }.collectAsStateWithLifecycle(initialValue = emptyList())
 
     val allowIncompatiblePatches by vm.prefs.disablePatchVersionCompatCheck.getAsState()
-    val patches = remember(bundles, allowIncompatiblePatches) {
+    val patches by remember {
-        vm.getPatches(bundles, allowIncompatiblePatches)
+        derivedStateOf {
+            vm.getPatches(bundles, allowIncompatiblePatches)
+        }
     }
-    val selectedPatchCount = remember(patches) {
+    val selectedPatchCount by remember {
-        patches.values.sumOf { it.size }
+        derivedStateOf {
+            patches.values.sumOf { it.size }
+        }
     }
 
     val launcher = rememberLauncherForActivityResult(
@@ -72,7 +77,6 @@ fun SelectedAppInfoScreen(
     EventEffect(flow = vm.launchActivityFlow) { intent ->
         launcher.launch(intent)
     }
-    val composableScope = rememberCoroutineScope()
 
     val error by vm.errorFlow.collectAsStateWithLifecycle(null)
     Scaffold(
@@ -99,19 +103,11 @@ fun SelectedAppInfoScreen(
 
                         return@patchClick
                     }
-
+                    onPatchClick(
-                    composableScope.launch {
+                        vm.selectedApp,
-                        if (!vm.hasSetRequiredOptions(patches)) {
+                        patches,
-                            onRequiredOptions(
+                        vm.getOptionsFiltered(bundles)
-                                vm.selectedApp,
+                    )
-                                vm.getCustomPatches(bundles, allowIncompatiblePatches),
-                                vm.options
-                            )
-                            return@launch
-                        }
-
-                        onPatchClick()
-                    }
                 }
             )
         }

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

@@ -31,7 +31,6 @@ import app.revanced.manager.ui.component.ColumnWithScrollbar
 import app.revanced.manager.ui.component.GroupHeader
 import app.revanced.manager.ui.component.settings.BooleanItem
 import app.revanced.manager.ui.component.settings.IntegerItem
-import app.revanced.manager.ui.component.settings.SafeguardBooleanItem
 import app.revanced.manager.ui.component.settings.SettingsListItem
 import app.revanced.manager.ui.viewmodel.AdvancedSettingsViewModel
 import app.revanced.manager.util.toast
@@ -105,33 +104,29 @@ fun AdvancedSettingsScreen(
             )
 
             GroupHeader(stringResource(R.string.safeguards))
-            SafeguardBooleanItem(
+            BooleanItem(
                 preference = vm.prefs.disablePatchVersionCompatCheck,
                 coroutineScope = vm.viewModelScope,
                 headline = R.string.patch_compat_check,
-                description = R.string.patch_compat_check_description,
+                description = R.string.patch_compat_check_description
-                confirmationText = R.string.patch_compat_check_confirmation
             )
-            SafeguardBooleanItem(
+            BooleanItem(
                 preference = vm.prefs.disableUniversalPatchWarning,
                 coroutineScope = vm.viewModelScope,
                 headline = R.string.universal_patches_safeguard,
-                description = R.string.universal_patches_safeguard_description,
+                description = R.string.universal_patches_safeguard_description
-                confirmationText = R.string.universal_patches_safeguard_confirmation
             )
-            SafeguardBooleanItem(
+            BooleanItem(
                 preference = vm.prefs.suggestedVersionSafeguard,
                 coroutineScope = vm.viewModelScope,
                 headline = R.string.suggested_version_safeguard,
-                description = R.string.suggested_version_safeguard_description,
+                description = R.string.suggested_version_safeguard_description
-                confirmationText = R.string.suggested_version_safeguard_confirmation
             )
-            SafeguardBooleanItem(
+            BooleanItem(
                 preference = vm.prefs.disableSelectionWarning,
                 coroutineScope = vm.viewModelScope,
                 headline = R.string.patch_selection_safeguard,
-                description = R.string.patch_selection_safeguard_description,
+                description = R.string.patch_selection_safeguard_description
-                confirmationText = R.string.patch_selection_safeguard_confirmation
             )
 
             GroupHeader(stringResource(R.string.debugging))

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

@@ -1,5 +1,6 @@
 package app.revanced.manager.ui.screen.settings
 
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -95,7 +96,7 @@ fun ContributorScreen(
     }
 }
 
-@OptIn(ExperimentalLayoutApi::class)
+@OptIn(ExperimentalLayoutApi::class, ExperimentalFoundationApi::class)
 @Composable
 fun ContributorsCard(
     title: String,
@@ -130,7 +131,7 @@ fun ContributorsCard(
                 verticalAlignment = Alignment.CenterVertically
             ) {
                 Text(
-                    text = title,
+                    text = processHeadlineText(title),
                     style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Medium)
                 )
                 Text(
@@ -198,4 +199,11 @@ fun ContributorsCard(
             }
         }
     }
+}
+
+fun processHeadlineText(repositoryName: String): String {
+    return repositoryName.replace("revanced/revanced-", "")
+        .replace("-", " ")
+        .split(" ").joinToString(" ") { if (it.length > 3) it else it.uppercase() }
+        .replaceFirstChar { it.uppercase() }
 }

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

@@ -24,9 +24,7 @@ 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.delay
 import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 
@@ -58,19 +56,14 @@ class DashboardViewModel(
 
     var updatedManagerVersion: String? by mutableStateOf(null)
         private set
-    val showBatteryOptimizationsWarningFlow = flow {
+    var showBatteryOptimizationsWarning by mutableStateOf(false)
-        while (true) {
+        private set
-            // There is no callback for this, so we have to poll it.
-            val result = !powerManager.isIgnoringBatteryOptimizations(app.packageName)
-            emit(result)
-            if (!result) return@flow
-            delay(500L)
-        }
-    }
 
     init {
         viewModelScope.launch {
             checkForManagerUpdates()
+            showBatteryOptimizationsWarning =
+                !powerManager.isIgnoringBatteryOptimizations(app.packageName)
         }
     }
 

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

@@ -2,10 +2,13 @@ package app.revanced.manager.ui.viewmodel
 
 import android.app.Activity
 import android.app.Application
+import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.util.Base64
 import android.util.Log
+import androidx.activity.ComponentActivity
 import androidx.activity.result.ActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import app.revanced.manager.R
@@ -25,7 +28,6 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.SerializationException
 import kotlinx.serialization.json.Json
 
 class MainViewModel(
@@ -34,13 +36,10 @@ class MainViewModel(
     private val downloadedAppRepository: DownloadedAppRepository,
     private val keystoreManager: KeystoreManager,
     private val app: Application,
-    val prefs: PreferencesManager,
+    val prefs: PreferencesManager
-    private val json: Json
 ) : ViewModel() {
     private val appSelectChannel = Channel<SelectedApp>()
     val appSelectFlow = appSelectChannel.receiveAsFlow()
-    private val legacyImportActivityChannel = Channel<Intent>()
-    val legacyImportActivityFlow = legacyImportActivityChannel.receiveAsFlow()
 
     private suspend fun suggestedVersion(packageName: String) =
         patchBundleRepository.suggestedVersions.first()[packageName]
@@ -51,8 +50,7 @@ class MainViewModel(
         val suggestedVersion = suggestedVersion(app.packageName) ?: return null
 
         val downloadedApp =
-            downloadedAppRepository.get(app.packageName, suggestedVersion, markUsed = true)
+            downloadedAppRepository.get(app.packageName, suggestedVersion, markUsed = true) ?: return null
-                ?: return null
         return SelectedApp.Local(
             downloadedApp.packageName,
             downloadedApp.version,
@@ -69,46 +67,42 @@ class MainViewModel(
         selectApp(SelectedApp.Search(packageName, suggestedVersion(packageName)))
     }
 
-    init {
+    fun importLegacySettings(componentActivity: ComponentActivity) {
-        viewModelScope.launch {
+        if (!prefs.firstLaunch.getBlocking()) return
-            if (!prefs.firstLaunch.get()) return@launch
+
-            legacyImportActivityChannel.send(Intent().apply {
+        try {
+            val launcher = componentActivity.registerForActivityResult(
+                ActivityResultContracts.StartActivityForResult()
+            ) { result: ActivityResult ->
+                if (result.resultCode == Activity.RESULT_OK) {
+                    result.data?.getStringExtra("data")?.let {
+                        applyLegacySettings(it)
+                    } ?: app.toast(app.getString(R.string.legacy_import_failed))
+                } else {
+                    app.toast(app.getString(R.string.legacy_import_failed))
+                }
+            }
+
+            val intent = Intent().apply {
                 setClassName(
                     "app.revanced.manager.flutter",
                     "app.revanced.manager.flutter.ExportSettingsActivity"
                 )
-            })
+            }
+
+            launcher.launch(intent)
+        } catch (e: Exception) {
+            if (e !is ActivityNotFoundException) {
+                app.toast(app.getString(R.string.legacy_import_failed))
+                Log.e(tag, "Failed to launch legacy import activity: $e")
+            }
         }
     }
 
-    fun applyLegacySettings(result: ActivityResult) {
+    private fun applyLegacySettings(data: String) = viewModelScope.launch {
-        if (result.resultCode != Activity.RESULT_OK) {
+        val json = Json { ignoreUnknownKeys = true }
-            app.toast(app.getString(R.string.legacy_import_failed))
+        val settings = json.decodeFromString<LegacySettings>(data)
-            Log.e(
-                tag,
-                "Got unknown result code while importing legacy settings: ${result.resultCode}"
-            )
-            return
-        }
 
-        val jsonStr = result.data?.getStringExtra("data")
-        if (jsonStr == null) {
-            app.toast(app.getString(R.string.legacy_import_failed))
-            Log.e(tag, "Legacy settings data is null")
-            return
-        }
-        val settings = try {
-            json.decodeFromString<LegacySettings>(jsonStr)
-        } catch (e: SerializationException) {
-            app.toast(app.getString(R.string.legacy_import_failed))
-            Log.e(tag, "Legacy settings data could not be deserialized", e)
-            return
-        }
-
-        applyLegacySettings(settings)
-    }
-
-    private fun applyLegacySettings(settings: LegacySettings) = viewModelScope.launch {
         settings.themeMode?.let { theme ->
             val themeMap = mapOf(
                 0 to Theme.SYSTEM,
@@ -151,7 +145,6 @@ class MainViewModel(
         settings.patches?.let { selection ->
             patchSelectionRepository.import(0, selection)
         }
-        Log.d(tag, "Imported legacy settings")
     }
 
     @Serializable

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

@@ -1,6 +1,7 @@
 package app.revanced.manager.ui.viewmodel
 
 import android.app.Application
+import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.setValue
@@ -21,6 +22,7 @@ import app.revanced.manager.patcher.patch.PatchInfo
 import app.revanced.manager.ui.model.BundleInfo
 import app.revanced.manager.ui.model.BundleInfo.Extensions.bundleInfoFlow
 import app.revanced.manager.ui.model.BundleInfo.Extensions.toPatchSelection
+import app.revanced.manager.ui.model.SelectedApp
 import app.revanced.manager.ui.model.navigation.SelectedApplicationInfo
 import app.revanced.manager.util.Options
 import app.revanced.manager.util.PatchSelection
@@ -35,14 +37,11 @@ import kotlinx.coroutines.launch
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.get
 import kotlinx.collections.immutable.*
-import kotlinx.coroutines.CoroutineStart
-import kotlinx.coroutines.async
-import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
 
+@Stable
 @OptIn(SavedStateHandleSaveableApi::class)
-class PatchesSelectorViewModel(input: SelectedApplicationInfo.PatchesSelector.ViewModelParams) :
+class PatchesSelectorViewModel(input: SelectedApplicationInfo.PatchesSelector.ViewModelParams) : ViewModel(), KoinComponent {
-    ViewModel(), KoinComponent {
     private val app: Application = get()
     private val savedStateHandle: SavedStateHandle = get()
     private val prefs: PreferencesManager = get()
@@ -103,7 +102,7 @@ class PatchesSelectorViewModel(input: SelectedApplicationInfo.PatchesSelector.Vi
 
     val compatibleVersions = mutableStateListOf<String>()
 
-    var filter by mutableIntStateOf(SHOW_UNIVERSAL)
+    var filter by mutableIntStateOf(0)
         private set
 
     private val defaultPatchSelection = bundlesFlow.map { bundles ->
@@ -115,22 +114,6 @@ class PatchesSelectorViewModel(input: SelectedApplicationInfo.PatchesSelector.Vi
         selection.values.sumOf { it.size }
     }
 
-    // This is for the required options screen.
-    private val requiredOptsPatchesDeferred = viewModelScope.async(start = CoroutineStart.LAZY) {
-        bundlesFlow.first().map { bundle ->
-            bundle to bundle.all.filter { patch ->
-                val opts by lazy {
-                    getOptions(bundle.uid, patch).orEmpty()
-                }
-                isSelected(
-                    bundle.uid,
-                    patch
-                ) && patch.options?.any { it.required && it.default == null && it.key !in opts } ?: false
-            }.toList()
-        }.filter { (_, patches) -> patches.isNotEmpty() }
-    }
-    val requiredOptsPatches = flow { emit(requiredOptsPatchesDeferred.await()) }
-
     fun selectionIsValid(bundles: List<BundleInfo>) = bundles.any { bundle ->
         bundle.patchSequence(allowIncompatiblePatches).any { patch ->
             isSelected(bundle.uid, patch)
@@ -217,8 +200,9 @@ class PatchesSelectorViewModel(input: SelectedApplicationInfo.PatchesSelector.Vi
     }
 
     companion object {
-        const val SHOW_UNSUPPORTED = 1 // 2^0
+        const val SHOW_SUPPORTED = 1 // 2^0
         const val SHOW_UNIVERSAL = 2 // 2^1
+        const val SHOW_UNSUPPORTED = 4 // 2^2
 
         private val optionsSaver: Saver<PersistentOptions, Options> = snapshotStateMapSaver(
             // Patch name -> Options

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

@@ -9,7 +9,6 @@ import android.util.Log
 import androidx.activity.result.ActivityResult
 import androidx.annotation.StringRes
 import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
@@ -30,16 +29,13 @@ import app.revanced.manager.domain.repository.PatchOptionsRepository
 import app.revanced.manager.domain.repository.PatchSelectionRepository
 import app.revanced.manager.network.downloader.LoadedDownloaderPlugin
 import app.revanced.manager.network.downloader.ParceledDownloaderData
-import app.revanced.manager.patcher.patch.PatchInfo
 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.BundleInfo
 import app.revanced.manager.ui.model.BundleInfo.Extensions.bundleInfoFlow
 import app.revanced.manager.ui.model.BundleInfo.Extensions.toPatchSelection
-import app.revanced.manager.ui.model.BundleInfo.Extensions.requiredOptionsSet
 import app.revanced.manager.ui.model.SelectedApp
-import app.revanced.manager.ui.model.navigation.Patcher
 import app.revanced.manager.ui.model.navigation.SelectedApplicationInfo
 import app.revanced.manager.util.Options
 import app.revanced.manager.util.PM
@@ -67,6 +63,7 @@ class SelectedAppInfoViewModel(
     input: SelectedApplicationInfo.ViewModelParams
 ) : ViewModel(), KoinComponent {
     private val app: Application = get()
+    val bundlesRepo: PatchBundleRepository = get()
     private val bundleRepository: PatchBundleRepository = get()
     private val selectionRepository: PatchSelectionRepository = get()
     private val optionsRepository: PatchOptionsRepository = get()
@@ -177,10 +174,6 @@ class SelectedAppInfoViewModel(
         }
     }
 
-    val bundleInfoFlow by derivedStateOf {
-        bundleRepository.bundleInfoFlow(packageName, selectedApp.version)
-    }
-
     fun showSourceSelector() {
         dismissSourceSelector()
         showSourceSelector = true
@@ -267,23 +260,6 @@ class SelectedAppInfoViewModel(
         selectedAppInfo = info
     }
 
-    suspend fun hasSetRequiredOptions(patchSelection: PatchSelection) = bundleInfoFlow
-        .first()
-        .requiredOptionsSet(
-            isSelected = { bundle, patch -> patch.name in patchSelection[bundle.uid]!! },
-            optionsForPatch = { bundle, patch -> options[bundle.uid]?.get(patch.name) },
-        )
-
-    suspend fun getPatcherParams(): Patcher.ViewModelParams {
-        val allowUnsupported = prefs.disablePatchVersionCompatCheck.get()
-        val bundles = bundleInfoFlow.first()
-        return Patcher.ViewModelParams(
-            selectedApp,
-            getPatches(bundles, allowUnsupported),
-            getOptionsFiltered(bundles)
-        )
-    }
-
     fun getOptionsFiltered(bundles: List<BundleInfo>) = options.filtered(bundles)
 
     fun getPatches(bundles: List<BundleInfo>, allowUnsupported: Boolean) =
@@ -296,7 +272,7 @@ class SelectedAppInfoViewModel(
         (selectionState as? SelectionState.Customized)?.patches(bundles, allowUnsupported)
 
     fun updateConfiguration(selection: PatchSelection?, options: Options) = viewModelScope.launch {
-        val bundles = bundleInfoFlow.first()
+        val bundles = bundlesRepo.bundleInfoFlow(packageName, selectedApp.version).first()
 
         selectionState = selection?.let(SelectionState::Customized) ?: SelectionState.Default
 

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

@@ -88,16 +88,12 @@
     <string name="safeguards">Safeguards</string>
     <string name="patch_compat_check">Disable version compatibility check</string>
     <string name="patch_compat_check_description">The check restricts patches to supported app versions</string>
-    <string name="patch_compat_check_confirmation">Selecting incompatible patches can result in a broken app.\n\nDo you want to proceed anyways?</string>
     <string name="suggested_version_safeguard">Require suggested app version</string>
     <string name="suggested_version_safeguard_description">Enforce selection of the suggested app version</string>
-    <string name="suggested_version_safeguard_confirmation">Selecting an app that is not the suggested version may cause unexpected issues.\n\nDo you want to proceed anyways?</string>
     <string name="patch_selection_safeguard">Allow changing patch selection</string>
     <string name="patch_selection_safeguard_description">Do not prevent selecting or deselecting patches</string>
-    <string name="patch_selection_safeguard_confirmation">Changing the selection of patches may cause unexpected issues.\n\nEnable anyways?</string>
     <string name="universal_patches_safeguard">Disable universal patch warning</string>
     <string name="universal_patches_safeguard_description">Disables the warning that appears when you try to select universal patches</string>
-    <string name="universal_patches_safeguard_confirmation">Universal patches are not as well tested as those that target specific apps.\n\nEnable anyways?</string>
     <string name="import_keystore">Import keystore</string>
     <string name="import_keystore_description">Import a custom keystore</string>
     <string name="import_keystore_dialog_title">Enter keystore credentials</string>
@@ -146,8 +142,6 @@
 
     <string name="options">Options</string>
     <string name="ok">OK</string>
-    <string name="yes">Yes</string>
-    <string name="no">No</string>
     <string name="edit">Edit</string>
     <string name="dialog_input_placeholder">Value</string>
     <string name="reset">Reset</string>
@@ -164,7 +158,6 @@
     <string name="warning">Warning</string>
     <string name="add">Add</string>
     <string name="close">Close</string>
-    <string name="clear">Clear</string>
     <string name="system">System</string>
     <string name="light">Light</string>
     <string name="dark">Dark</string>
@@ -211,7 +204,7 @@
     <string name="no_patched_apps_found">No patched apps found</string>
     <string name="tap_on_patches">Tap on the patches to get more information about them</string>
     <string name="bundles_selected">%s selected</string>
-    <string name="unsupported_patches">Incompatible patches</string>
+    <string name="unsupported_patches">Unsupported patches</string>
     <string name="universal_patches">Universal patches</string>
     <string name="patch_selection_reset_toast">Patch selection and options has been reset to recommended defaults</string>
     <string name="patch_options_reset_toast">Patch options have been reset</string>
@@ -220,10 +213,10 @@
     <string name="selection_warning_title">Stop using defaults?</string>
     <string name="selection_warning_description">It is recommended to use the default patch selection and options. Changing them may result in unexpected issues.\n\nYou need to turn on \"Allow changing patch selection\" in the advanced settings before toggling patches.</string>
     <string name="universal_patch_warning_description">Universal patches have a more generalized use and do not work as reliably as patches that target specific apps. You may encounter issues while using them.\n\nThis warning can be disabled in the advanced settings.</string>
-    <string name="supported">This version</string>
+    <string name="supported">Supported</string>
-    <string name="universal">Any app</string>
+    <string name="universal">Universal</string>
     <string name="unsupported">Unsupported</string>
-    <string name="search_patches">Search patches</string>
+    <string name="search_patches">Patch name</string>
     <string name="app_not_supported">This patch is not compatible with the selected app version (%1$s).\n\nIt only supports the following version(s): %2$s.</string>
     <string name="continue_with_version">Continue with this version?</string>
     <string name="version_not_supported">Not all patches support this version (%s). Do you want to continue anyway?</string>
@@ -355,7 +348,6 @@
     <string name="download_manager_failed">Failed to download update: %s</string>
     <string name="cancel">Cancel</string>
     <string name="save">Save</string>
-    <string name="save_with_count">Save (%1$s)</string>
     <string name="update">Update</string>
     <string name="empty">Empty</string>
     <string name="installing_message">Tap on <b>Update</b> when prompted. \n ReVanced Manager will close when updating.</string>
@@ -367,8 +359,6 @@
     <string name="invalid_date">Invalid date</string>
     <string name="disable_battery_optimization">Disable battery optimization</string>
     <string name="input_dialog_value_invalid">Invalid value</string>
-    <string name="option_required">This option is required</string>
-    <string name="required_options_screen">Required options</string>
 
     <string name="failed_to_check_updates">Failed to check for updates: %s</string>
     <string name="no_update_available">No update available</string>

docs/0_prerequisites.md

@@ -1,11 +1,10 @@
 # 💼 Prerequisites
 
-To use ReVanced Manager, certain requirements have to be met.
+In order to use ReVanced Manager, certain requirements must be met.
 
 ## 🤝 Requirements
 
-- Android device running Android 8.0 or higher
+- An Android device running Android 8 or higher
-- **Optionally** Rooted Android device with latest version of [KernelSU](https://github.com/tiann/KernelSU) or [Magisk](https://github.com/topjohnwu/Magisk)
 
 ## ⏭️ What's next
 

docs/1_installation.md

@@ -1,26 +1,14 @@
 # ⬇️ Installation
 
-To use ReVanced on your Android device, ReVanced Manager have to be install, 
+In order to use ReVanced on your Android device, ReVanced Manager must be installed.
-refer to the [Prerequisites](0_prerequisites.md) if haven't already.
 
-## 🪜 Installation steps
+## ✅ Installation steps
 
-1. Get the latest version of ReVanced Manager from the [ReVanced site][Official ReVanced Download].
+1. Download the latest version of ReVanced Manager from [here](https://github.com/revanced/revanced-manager/releases/latest)
 2. Install ReVanced Manager
 
-### ✒️ Verifying authenticity of ReVanced Manager
-
-> [!NOTE]
-> It's always advisable that you download from trusted sources like the [ReVanced site][Official ReVanced Download]
-> or GitHub releases as it's the safest way to download ReVanced without potential risk of malware.
-
-To verify if your ReVanced Manager is provided without sign of tampering, 
-we have signed the APK with hashes corresponding to `b6362c6ea7888efd15c0800f480786ad0f5b133b4f84e12d46afba5f9eac1223` *unless otherwise stated*.
-
 ## ⏭️ What's next
 
 The next page will guide you through using ReVanced Manager.
 
 Continue: [🛠️ Usage](2_usage.md)
-
-[Official ReVanced Download]: https://revanced.app/download

docs/2_1_patching.md

@@ -8,26 +8,16 @@ The following pages will guide you through using ReVanced Manager to patch apps.
 2. Tap the + button in the bottom right corner
 3. Choose an app to patch[^1]
 4. Tap on the version of the app you want to patch[^2]
-5. Tap the 🪄 **Patch** button
+5. Select the patches you want to apply
-6. Tap on the 📲 **Install** button
+6. Tap the Patch button
-   > [!Note]
+7. Tap on the **Install** button
-   > If the **Install** Button isn't there, it could be that something went wrong. Refer to [3. ❔ Troubleshooting](3_troubleshooting.md)
+   > **Note**: If you are rooted, you can mount the patched app on top of the original app.[^3]
-   > [!Tip]
+   > Optionally, you may export the patched app to storage using the options in the top right corner.
-   > If you are rooted, you can mount the patched app on top of the original app.[^3]
-   > Optionally, you may export the patched app to storage using the options in the bottom left corner.
 
-[^1]: You need to select an APK from storage, in which case you have to source the APK file yourself. ReVanced does not provide any APK files.
+[^1]: Non-root users may be prompted to select an APK from storage, in which case you have to source the APK file yourself. ReVanced does not provide any APK files.
 [^2]: It is suggested to use the version with the most patches to get the most out of ReVanced.
 [^3]: Mounting the patched app on top of the original app will only work if the installed app version matches the version of the app selected in step 4. above.
 
-### Change patch selection and options
-
-Before you can change the selection of patches, follow the step below to allow changing the selection of patches.
-
-1. Tap ⚙️ Settings button in the top right corner
-2. Go to Advanced Settings
-3. Toggle "Allow changing patch selection" on
-
 ## ⏭️ What's next
 
 The next page will bring you back to the usage page.

docs/2_2_managing.md

@@ -6,13 +6,10 @@ After patching an app, you may want to manage it. This page will guide you throu
 
 1. Navigate to the Apps tab from the top navigation bar
 2. Select the app you want to manage
-
+3. 
-Inside you will be able to open, and uninstall the app within the manager, 
-additionally you will be able to repatch the app by patching the app again, see [🧩 Patching apps](2_1_patching.md),
-and view all patches applied to the patched app.
-
 ## ⏭️ What's next
 
 The next page will bring you back to the usage page.
 
 Continue: [🛠️ Usage](2_usage.md)
+

docs/2_3_updating.md

@@ -4,25 +4,7 @@ In order to keep up with the latest features and bug fixes, it is recommended to
 
 ## ✅ Updating steps
 
-1. Tap the ↻ Update button in the top right corner right next to the ⚙️ Settings icon
+> Currently not implemented
-2. Tap the **Update** button in the bottom right corner
-3. Wait for the update to be downloaded
-4. Tap the **Install** button to install[^1]
-   > [!Note]
-   > If you see a prompt regarding your device is unable to install application for security reason 
-   > you may need to allow ReVanced Manager to install APK file on your device.
-   > 1. Tap on Settings
-   > 2. Toggle "Allow from this source" on
-5. Wait for installation prompt to show then tap **Install** again
-6. Open ReVanced Manager again to see the new version
-
-## 🔎 Check for update
-
-Usually ReVanced Manager always check update on first startup, so it's not need to manually check for update yourself.
-To trigger the check for update function follow the step bellow:
-
-1. Go to ⚙️ Settings menu and ↻ Update section
-2. Tap on "Check for updates"
 
 ## ⏭️ What's next
 

docs/2_4_settings.md

@@ -8,44 +8,30 @@ ReVanced Manager has settings that can be configured to your liking.
 
   Specify the URL of the API to use. This is used to fetch ReVanced Patches and update ReVanced Manager.
 
-  Location: `⚙️ Settings -> Advanced -> API URL`
-
 - ### 🧬 Sources
 
   Override the API and change the source of ReVanced Patches.
 
-  Location: `Patch bundles -> + Button`
+- ### 🧪 Experimental ReVanced Patches support
-
-- ### 🧪 Experimental patches
 
   Lift app version constraints from ReVanced Patches. This allows you to patch any version of an app, even if the patch is not explicitly compatible with it.
 
-  Location: `⚙️ Settings -> Advanced -> Safeguards`
-
 - ### 🧑‍🔬 Experimental universal support
 
   This will show or hide ReVanced Patches, which are not meant for any app in particular but rather for all apps but may not work on all apps.
 
-  Location: `⚙️ Settings -> Advanced -> Safeguards`
-
 - ### 🔑 Export, import or delete keystore
 
   Manage the keystore used to sign patched apps.
 
-  Location: `⚙️ Settings -> Import & export -> Signing`
+- ### 📄 Export, import or reset ReVanced Patches selection
 
-- ### 📄 Export, import or reset patch selection
+  Manage the ReVanced Patches selection. This is useful if you want to share your ReVanced Patches selection with others or reset it to the default selection.
-
-  Manage the ReVanced Patches selection. This is useful if you want to share your patch selection with others or reset it to the default selection.
-
-  Location: `⚙️ Settings -> Import & export -> Patches`
 
 - ### ℹ️ About
 
   View information about your device and ReVanced Manager. This includes the version of ReVanced Manager and supported architectures of your device.
 
-  Location: `⚙️ Settings -> About`
-
 ## ⏭️ What's next
 
 The next page will bring you back to the usage page.

docs/3_troubleshooting.md

@@ -10,19 +10,11 @@ In case you encounter any issues while using ReVanced Manager, please refer to t
 
   An existing installation of the app you're trying to patch is conflicting with the patched app. Uninstall the existing app before installing the patched app.
 
-- 🥛 Out Of Memory error
-
-  This indicates that your device is not giving ReVanced Manager enough memory to patch the app.
-
-  Turning on  `⚙️ Settings -> Advanced -> toggle "Run Patcher in another process (experimental)"` may solve the issue.
-
 - ❗️ Error code `135`, `139` or `1` when patching the app
 
   Your device is not supported. Refer to the [Prerequisites](0_prerequisites.md) page for supported devices.
 
-  Alternatively, you can use [ReVanced CLI][ReVanced CLI GitHub]) to patch the app.
+  Alternatively, you can use [ReVanced CLI](https://github.com/revanced/revanced-cli) to patch the app.
-
-  [ReVanced CLI GitHub]: https://github.com/revanced/revanced-cli
 
 - 🚫 Non-root install is not possible with the current patches selection
 
@@ -30,14 +22,10 @@ In case you encounter any issues while using ReVanced Manager, please refer to t
 
 - 🚨 Patched app crashes on launch
 
-  Try selecting the **Default** button when choosing patches, if the patched app still failed, file an issue at [ReVanced Patches][ReVanced Patches GitHub].
+  Select the **Default** button when choosing patches.
-
-  [ReVanced Patches GitHub]: https://github.com/revanced/revanced-patches
 
 ## ⏭️ What's next
 
-You have successfully finished the guide for on how to use ReVanced Manager.
+The next page will teach you how to build ReVanced Manager from source.
 
-If you wish to review the Table of Content for how to use ReVanced Manager, feel free to do so.
+Continue: [🔨 Building from source](4_building.md)
-
-Continue: [💊 ReVanced Manager](/docs/README.md)

docs/4_building.md

@@ -0,0 +1,38 @@
+# 🛠️ Building from source
+
+This page will guide you through building ReVanced Manager from source.
+
+1. Download Java SDK 17 ([Azul JDK](https://www.azul.com/downloads/?version=java-17-lts&package=jdk#zulu) or [OpenJDK](https://jdk.java.net/java-se-ri/17)) and add it to path
+
+2. Clone the repository
+
+   ```sh
+   git clone https://github.com/revanced/revanced-manager.git && cd revanced-manager
+   ```
+
+3. Create a GitHub personal access token with the `read:packages` scope [here](https://github.com/settings/tokens/new?scopes=read:packages&description=ReVanced)
+
+4. Add your GitHub username and the token to `~/.gradle/gradle.properties`
+
+   ```properties
+   gpr.user = YourUsername
+   gpr.key = ghp_longrandomkey
+   ```
+
+5. Set the `sdk.dir` property in `local.properties` to your Android SDK location
+
+   ```properties
+   sdk.dir = /path/to/android/sdk
+   ```
+
+6. Build the APK
+
+   Debug:
+   ```sh
+   ./gradlew assembleDebug
+   ```
+
+   Release:
+   ```sh
+   ./gradlew assembleRelease -Psign
+   ```

docs/README.md

@@ -1,6 +1,6 @@
 # 💊 ReVanced Manager
 
-This documentation explains how to use [ReVanced Manager](https://github.com/ReVanced/revanced-manager).
+This documentation explains how to use [ReVanced Manager](https://github.com/revanced/revanced-manager).
 
 ## 📖 Table of contents
 
@@ -12,10 +12,7 @@ This documentation explains how to use [ReVanced Manager](https://github.com/ReV
    3. [🔄 Updating ReVanced Manager](2_3_updating.md)
    4. [⚙️ Configuring ReVanced Manager](2_4_settings.md)
 3. [❔ Troubleshooting](3_troubleshooting.md)
-
+4. [🔨 Building from source](4_building.md)
-## 🧑‍💻 Developing for ReVanced Manager
-
-Checkout the documentation for developer [here](developer/README.md).
 
 ## ⏭️ Start here
 

docs/developer/0_prerequisites.md

@@ -1,28 +0,0 @@
-# 💼 Prerequisites
-
-Here's everything you'll need to develop on ReVanced Manager
-
-## 🤝 Recommended environment
-
-- Any environment that is capable of running the latest Android Studio, latest Android SDK, and JDK 17 with at least 4 GB of memory for coding
-- Any devices with preferably the latest Android version or at least higher than the [`minSdk`](/app/build.gradle.kts) for testing
-- **Optionally** A device with root capabilities using the latest version of [KernelSU](https://github.com/tiann/KernelSU) or [Magisk](https://github.com/topjohnwu/Magisk)
-
-## ⚙️ Setting up
-
-### Authenticating to GitHub Registry
-
-ReVanced Manager use dependency from the GitHub Registry (i.e., [ReVanced Patcher](https://github.com/ReVanced/revanced-patcher/packages)) and so your build may fail without authenticating to the service,
-to authenticate you must create a personal access token with the scope `read:packages` [here](https://github.com/settings/tokens/new?scopes=read:packages&description=ReVanced)
-and add your token to `~/.gradle/gradle.properties`, create the file if it does not exist.
-
-```properties
-gpr.user = username
-gpr.key = ghp_******************************
-```
-
-## ⏭️ What's next
-
-The next page will guide you through developing for ReVanced Manager.
-
-Continue: [🧑‍💻 Developing for ReVanced Manager](1_develop.md)

docs/developer/1_develop.md

@@ -1,25 +0,0 @@
-# 🧑‍💻 Developing for ReVanced Manager
-
-ReVanced Manager is developed on Kotlin using [Jetpack Compose](https://developer.android.com/compose), here are some tips to help you get started.
-
-## Code style
-
-The styling is based on https://kotlinlang.org/docs/coding-conventions.html
-
-## Commit
-
-At ReVanced, we adopt a naming convention for commit called [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) so for example when you're adding a new feature you must add `feat: ` before the description of your commit.
-
-## Building
-
-To build ReVanced Manager, simply hit build button on your IDE or run:
-
-```sh
-./gradlew assembleDebug
-```
-
-## ⏭️ What's next
-
-The next page will guide you through developing for ReVanced Manager.
-
-Continue: [🎉 Submitting your Pull Request](2_submitting.md)

docs/developer/2_submitting.md

@@ -1,21 +0,0 @@
-# 🎉 Submitting your Pull Request
-
-> [!TIP]
-> We recommend that you discuss your changes with 
-> the maintainers of ReVanced Manager before contributing. 
-> This will help you determine whether your change is acceptable.
-
-1. Fork the repository and create your branch from `dev`
-2. Commit your changes in [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) style
-3. Submit a pull request to the `dev` branch of the repository and reference issues that your pull request closes in the description of your pull request
-4. Our team will review your pull request and provide feedback. Once your pull request is approved, it will be merged into the `dev` branch and will be included in 
-   the next release of ReVanced Manager
-
-## ⏭️ What's next
-
-You have successfully finished the guide for developing for ReVanced Manager.
-
-This next section will be verifying the authenticity of ReVanced Manager
-which may be relevant for store provider or those who's looking to verify prebuilt librar(ies).
-
-Continue: [✒️ Verification and Authenticity of ReVanced Manager](3_verifying.md)

docs/developer/3_verifying.md

@@ -1,19 +0,0 @@
-# ✒️ Verification and Authenticity of ReVanced Manager
-
-> [!NOTE]
-> This information is more relevant to alternative store providers
-
-To distribute ReVanced Manager safely and recommended way is to provide the users with a link to 
-[1. ⬇️ Installation, ✒️ Verifying authenticity of ReVanced Manager (user-side)][installation authenticity].
-
-The certificate SHA-256 of the APK will always be `b6362c6ea7888efd15c0800f480786ad0f5b133b4f84e12d46afba5f9eac1223` unless otherwise noted.
-
-[installation authenticity]: /docs/1_installation.md#%EF%B8%8F-verifying-authenticity-of-revanced-manager
-
-## `libaapt2.so`
-
-ReVanced Manager includes prebuilt binaries of [`libaapt2.so`][location of libaapt2.so] from https://github.com/ReVanced/aapt2 
-
-which fixes issues on ARM32-based systems. Attestation is provided here: https://github.com/ReVanced/aapt2/attestations
-
-[location of libaapt2.so]: /app/src/main/jniLibs/

docs/developer/README.md

@@ -1,25 +0,0 @@
-# 💊 ReVanced Manager
-
-> [!WARNING]
-> This guide is for people who want to develop for ReVanced Manager, may feature technical words or jargons.
-> For regular user you may want to view this [documentation](/docs/README.md) instead.
-
-This documentation explains how to develop for [ReVanced Manager](https://github.com/ReVanced/revanced-manager).
-
-## 📖 Table of contents
-
-## Developing
-
-0. [💼 Prerequisites](0_prerequisites.md)
-1. [🧑‍💻 Developing for ReVanced Manager](1_developing.md)
-2. [🎉 Submitting your Pull Request](2_submitting.md)
-
-## Transparency
-
-1. [✒️ Verification and Authenticity of ReVanced Manager](3_verifying.md)
-
-## ⏭️ Start here
-
-The next page will tell you about the prerequisites for developing for ReVanced Manager.
-
-Continue: [💼 Prerequisites](0_prerequisites.md)

gradle/libs.versions.toml

@@ -24,7 +24,7 @@ ktor = "2.3.9"
 markdown-renderer = "0.22.0"
 fading-edges = "1.0.4"
 kotlin = "2.1.0"
-android-gradle-plugin = "8.8.0"
+android-gradle-plugin = "8.7.3"
 dev-tools-gradle-plugin = "2.1.0-1.0.29"
 about-libraries-gradle-plugin = "11.1.1"
 binary-compatibility-validator = "0.17.0"

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
+#Tue Nov 12 21:36:50 CET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=7a00d51fb93147819aab76024feece20b6b84e420694101f276be952e08bef03
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 
 ##############################################################################
 #
@@ -57,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -86,7 +84,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,8 +13,6 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -45,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo. 1>&2
+echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo. 1>&2
+echo.
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation. 1>&2
+echo location of your Java installation.
 
 goto fail
 
@@ -59,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo. 1>&2
+echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo. 1>&2
+echo.
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation. 1>&2
+echo location of your Java installation.
 
 goto fail