Compare commits

..

1 Commits

Author SHA1 Message Date
21266bf5ce fix: display version from manifest 2025-07-04 18:56:36 +02:00
25 changed files with 162 additions and 213 deletions

View File

@ -15,7 +15,7 @@ class LocalPatchBundle(name: String, id: Int, directory: File) :
} }
reload()?.also { reload()?.also {
saveVersionHash(it.patchBundleManifestAttributes?.version) saveVersionHash(it.readManifestAttribute("Version"))
} }
} }
} }

View File

@ -34,11 +34,11 @@ sealed class PatchBundleSource(initialName: String, val uid: Int, directory: Fil
private val _nameFlow = MutableStateFlow(initialName) private val _nameFlow = MutableStateFlow(initialName)
val nameFlow = val nameFlow =
_nameFlow.map { it.ifEmpty { app.getString(if (isDefault) R.string.patches_name_default else R.string.patches_name_fallback) } } _nameFlow.map { it.ifEmpty { app.getString(if (isDefault) R.string.bundle_name_default else R.string.bundle_name_fallback) } }
suspend fun getName() = nameFlow.first() suspend fun getName() = nameFlow.first()
val versionFlow = state.map { it.patchBundleOrNull()?.patchBundleManifestAttributes?.version } val versionFlow = state.map { it.patchBundleOrNull()?.readManifestAttribute("Version") }
val patchCountFlow = state.map { it.patchBundleOrNull()?.patches?.size ?: 0 } val patchCountFlow = state.map { it.patchBundleOrNull()?.patches?.size ?: 0 }
/** /**
@ -74,7 +74,7 @@ sealed class PatchBundleSource(initialName: String, val uid: Int, directory: Fil
val bundle = newState.patchBundleOrNull() val bundle = newState.patchBundleOrNull()
// Try to read the name from the patch bundle manifest if the bundle does not have a name. // Try to read the name from the patch bundle manifest if the bundle does not have a name.
if (bundle != null && _nameFlow.value.isEmpty()) { if (bundle != null && _nameFlow.value.isEmpty()) {
bundle.patchBundleManifestAttributes?.name?.let { setName(it) } bundle.readManifestAttribute("Name")?.let { setName(it) }
} }
return bundle return bundle

View File

@ -50,7 +50,7 @@ sealed class RemotePatchBundle(name: String, id: Int, directory: File, val endpo
suspend fun setAutoUpdate(value: Boolean) = configRepository.setAutoUpdate(uid, value) suspend fun setAutoUpdate(value: Boolean) = configRepository.setAutoUpdate(uid, value)
companion object { companion object {
const val updateFailMsg = "Failed to update patches" const val updateFailMsg = "Failed to update patch bundle(s)"
} }
} }

View File

@ -40,8 +40,6 @@ class DownloadedAppRepository(
data: Parcelable, data: Parcelable,
expectedPackageName: String, expectedPackageName: String,
expectedVersion: String?, expectedVersion: String?,
appCompatibilityCheck: Boolean,
patchesCompatibilityCheck: Boolean,
onDownload: suspend (downloadProgress: Pair<Long, Long?>) -> Unit, onDownload: suspend (downloadProgress: Pair<Long, Long?>) -> Unit,
): File { ): File {
// Converted integers cannot contain / or .. unlike the package name or version, so they are safer to use here. // Converted integers cannot contain / or .. unlike the package name or version, so they are safer to use here.
@ -98,12 +96,7 @@ class DownloadedAppRepository(
val pkgInfo = val pkgInfo =
pm.getPackageInfo(targetFile.toFile()) ?: error("Downloaded APK file is invalid") pm.getPackageInfo(targetFile.toFile()) ?: error("Downloaded APK file is invalid")
if (pkgInfo.packageName != expectedPackageName) error("Downloaded APK has the wrong package name. Expected: $expectedPackageName, Actual: ${pkgInfo.packageName}") if (pkgInfo.packageName != expectedPackageName) error("Downloaded APK has the wrong package name. Expected: $expectedPackageName, Actual: ${pkgInfo.packageName}")
expectedVersion?.let { if (expectedVersion != null && pkgInfo.versionName != expectedVersion) error("Downloaded APK has the wrong version. Expected: $expectedVersion, Actual: ${pkgInfo.versionName}")
if (
pkgInfo.versionName != expectedVersion &&
(appCompatibilityCheck || patchesCompatibilityCheck)
) error("The selected app version ($pkgInfo.versionName) doesn't match the suggested version. Please use the suggested version ($expectedVersion), or adjust your settings by disabling \"Require suggested app version\" and enabling \"Disable version compatibility check\".")
}
// Delete the previous copy (if present). // Delete the previous copy (if present).
dao.get(pkgInfo.packageName, pkgInfo.versionName!!)?.directory?.let { dao.get(pkgInfo.packageName, pkgInfo.versionName!!)?.directory?.let {

View File

@ -165,7 +165,7 @@ class PatchBundleRepository(
getBundlesByType<RemotePatchBundle>().forEach { it.downloadLatest() } getBundlesByType<RemotePatchBundle>().forEach { it.downloadLatest() }
suspend fun updateCheck() = suspend fun updateCheck() =
uiSafe(app, R.string.patches_download_fail, "Failed to update bundles") { uiSafe(app, R.string.source_download_fail, "Failed to update bundles") {
coroutineScope { coroutineScope {
if (!networkInfo.isSafe()) { if (!networkInfo.isSafe()) {
Log.d(tag, "Skipping update check because the network is down or metered.") Log.d(tag, "Skipping update check because the network is down or metered.")

View File

@ -8,17 +8,6 @@ import java.io.File
import java.io.IOException import java.io.IOException
import java.util.jar.JarFile import java.util.jar.JarFile
class PatchBundleManifestAttributes(
val name: String?,
val version: String?,
val description: String?,
val source: String?,
val author: String?,
val contact: String?,
val website: String?,
val license: String?
)
class PatchBundle(val patchesJar: File) { class PatchBundle(val patchesJar: File) {
private val loader = object : Iterable<Patch<*>> { private val loader = object : Iterable<Patch<*>> {
private fun load(): Iterable<Patch<*>> { private fun load(): Iterable<Patch<*>> {
@ -47,20 +36,7 @@ class PatchBundle(val patchesJar: File) {
null null
} }
val patchBundleManifestAttributes = if(manifest != null) fun readManifestAttribute(name: String) = manifest?.mainAttributes?.getValue(name)
PatchBundleManifestAttributes(
name = readManifestAttribute("name"),
version = readManifestAttribute("version"),
description = readManifestAttribute("description"),
source = readManifestAttribute("source"),
author = readManifestAttribute("author"),
contact = readManifestAttribute("contact"),
website = readManifestAttribute("website"),
license = readManifestAttribute("license")
) else
null
private fun readManifestAttribute(name: String) = manifest?.mainAttributes?.getValue(name)?.takeIf { it.isNotBlank() } // If empty, set it to null instead.
/** /**
* Load all patches compatible with the specified package. * Load all patches compatible with the specified package.

View File

@ -14,9 +14,9 @@ import android.os.Parcelable
import android.os.PowerManager import android.os.PowerManager
import android.util.Log import android.util.Log
import androidx.activity.result.ActivityResult import androidx.activity.result.ActivityResult
import androidx.core.content.ContextCompat
import androidx.work.ForegroundInfo import androidx.work.ForegroundInfo
import androidx.work.WorkerParameters import androidx.work.WorkerParameters
import app.revanced.manager.MainActivity
import app.revanced.manager.R import app.revanced.manager.R
import app.revanced.manager.data.platform.Filesystem import app.revanced.manager.data.platform.Filesystem
import app.revanced.manager.data.room.apps.installed.InstallType import app.revanced.manager.data.room.apps.installed.InstallType
@ -88,25 +88,22 @@ class PatcherWorker(
) )
private fun createNotification(): Notification { private fun createNotification(): Notification {
val notificationIntent = Intent(applicationContext, MainActivity::class.java).apply { val notificationIntent = Intent(applicationContext, PatcherWorker::class.java)
flags = Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP val pendingIntent: PendingIntent = PendingIntent.getActivity(
}
val pendingIntent = PendingIntent.getActivity(
applicationContext, 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE applicationContext, 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE
) )
val channel = NotificationChannel( val channel = NotificationChannel(
"revanced-patcher-patching", "Patching", NotificationManager.IMPORTANCE_LOW "revanced-patcher-patching", "Patching", NotificationManager.IMPORTANCE_HIGH
) )
val notificationManager = val notificationManager =
applicationContext.getSystemService(NotificationManager::class.java) ContextCompat.getSystemService(applicationContext, NotificationManager::class.java)
notificationManager.createNotificationChannel(channel) notificationManager!!.createNotificationChannel(channel)
return Notification.Builder(applicationContext, channel.id) return Notification.Builder(applicationContext, channel.id)
.setContentTitle(applicationContext.getText(R.string.patcher_notification_title)) .setContentTitle(applicationContext.getText(R.string.app_name))
.setContentText(applicationContext.getText(R.string.patcher_notification_text)) .setContentText(applicationContext.getText(R.string.patcher_notification_message))
.setLargeIcon(Icon.createWithResource(applicationContext, R.drawable.ic_notification))
.setSmallIcon(Icon.createWithResource(applicationContext, R.drawable.ic_notification)) .setSmallIcon(Icon.createWithResource(applicationContext, R.drawable.ic_notification))
.setContentIntent(pendingIntent) .setContentIntent(pendingIntent).build()
.setCategory(Notification.CATEGORY_SERVICE)
.build()
} }
override suspend fun doWork(): Result { override suspend fun doWork(): Result {
@ -161,8 +158,6 @@ class PatcherWorker(
data, data,
args.packageName, args.packageName,
args.input.version, args.input.version,
prefs.suggestedVersionSafeguard.get(),
!prefs.disablePatchVersionCompatCheck.get(),
onDownload = args.onDownloadProgress onDownload = args.onDownloadProgress
).also { ).also {
args.setInputFile(it) args.setInputFile(it)

View File

@ -30,7 +30,7 @@ fun ExceptionViewerDialog(text: String, onDismiss: () -> Unit) {
Scaffold( Scaffold(
topBar = { topBar = {
BundleTopBar( BundleTopBar(
title = stringResource(R.string.patches_error), title = stringResource(R.string.bundle_error),
onBackClick = onDismiss, onBackClick = onDismiss,
backIcon = { backIcon = {
Icon( Icon(

View File

@ -2,26 +2,13 @@ package app.revanced.manager.ui.component.bundle
import android.webkit.URLUtil import android.webkit.URLUtil
import androidx.compose.foundation.clickable 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.ColumnScope
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.outlined.ArrowRight import androidx.compose.material.icons.automirrored.outlined.ArrowRight
import androidx.compose.material.icons.automirrored.outlined.Send import androidx.compose.material.icons.outlined.Extension
import androidx.compose.material.icons.outlined.Commit import androidx.compose.material.icons.outlined.Inventory2
import androidx.compose.material.icons.outlined.Description
import androidx.compose.material.icons.outlined.Gavel
import androidx.compose.material.icons.outlined.Language
import androidx.compose.material.icons.outlined.Person
import androidx.compose.material.icons.outlined.Sell import androidx.compose.material.icons.outlined.Sell
import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.*
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
@ -30,11 +17,10 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.platform.LocalUriHandler
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import app.revanced.manager.R import app.revanced.manager.R
import app.revanced.manager.patcher.patch.PatchBundleManifestAttributes
import app.revanced.manager.ui.component.ColumnWithScrollbar import app.revanced.manager.ui.component.ColumnWithScrollbar
import app.revanced.manager.ui.component.TextInputDialog import app.revanced.manager.ui.component.TextInputDialog
import app.revanced.manager.ui.component.haptics.HapticSwitch import app.revanced.manager.ui.component.haptics.HapticSwitch
@ -43,12 +29,12 @@ import app.revanced.manager.ui.component.haptics.HapticSwitch
fun BaseBundleDialog( fun BaseBundleDialog(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
isDefault: Boolean, isDefault: Boolean,
name: String?,
remoteUrl: String?, remoteUrl: String?,
onRemoteUrlChange: ((String) -> Unit)? = null, onRemoteUrlChange: ((String) -> Unit)? = null,
patchCount: Int, patchCount: Int,
version: String?, version: String?,
autoUpdate: Boolean, autoUpdate: Boolean,
bundleManifestAttributes: PatchBundleManifestAttributes?,
onAutoUpdateChange: (Boolean) -> Unit, onAutoUpdateChange: (Boolean) -> Unit,
onPatchesClick: () -> Unit, onPatchesClick: () -> Unit,
extraFields: @Composable ColumnScope.() -> Unit = {} extraFields: @Composable ColumnScope.() -> Unit = {}
@ -61,27 +47,36 @@ fun BaseBundleDialog(
Column( Column(
modifier = Modifier.padding(16.dp), modifier = Modifier.padding(16.dp),
verticalArrangement = Arrangement.spacedBy(4.dp) verticalArrangement = Arrangement.spacedBy(4.dp)
) {
Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.Start),
verticalAlignment = Alignment.CenterVertically
) {
Icon(
imageVector = Icons.Outlined.Inventory2,
contentDescription = null,
tint = MaterialTheme.colorScheme.primary,
modifier = Modifier.size(32.dp)
)
name?.let {
Text(
text = it,
style = MaterialTheme.typography.titleLarge.copy(fontWeight = FontWeight(800)),
color = MaterialTheme.colorScheme.primary,
)
}
}
Row(
horizontalArrangement = Arrangement.spacedBy(16.dp),
modifier = Modifier
.fillMaxWidth()
.padding(start = 2.dp)
) { ) {
version?.let { version?.let {
Tag(Icons.Outlined.Sell, it) Tag(Icons.Outlined.Sell, it)
} }
bundleManifestAttributes?.description?.let { Tag(Icons.Outlined.Extension, patchCount.toString())
Tag(Icons.Outlined.Description, it)
}
bundleManifestAttributes?.source?.let {
Tag(Icons.Outlined.Commit, it)
}
bundleManifestAttributes?.author?.let {
Tag(Icons.Outlined.Person, it)
}
bundleManifestAttributes?.contact?.let {
Tag(Icons.AutoMirrored.Outlined.Send, it)
}
bundleManifestAttributes?.website?.let {
Tag(Icons.Outlined.Language, it, isUrl = true)
}
bundleManifestAttributes?.license?.let {
Tag(Icons.Outlined.Gavel, it)
} }
} }
@ -92,8 +87,8 @@ fun BaseBundleDialog(
if (remoteUrl != null) { if (remoteUrl != null) {
BundleListItem( BundleListItem(
headlineText = stringResource(R.string.auto_update), headlineText = stringResource(R.string.bundle_auto_update),
supportingText = stringResource(R.string.auto_update_description), supportingText = stringResource(R.string.bundle_auto_update_description),
trailingContent = { trailingContent = {
HapticSwitch( HapticSwitch(
checked = autoUpdate, checked = autoUpdate,
@ -113,7 +108,7 @@ fun BaseBundleDialog(
if (showUrlInputDialog) { if (showUrlInputDialog) {
TextInputDialog( TextInputDialog(
initial = url, initial = url,
title = stringResource(R.string.patches_url), title = stringResource(R.string.bundle_input_source_url),
onDismissRequest = { showUrlInputDialog = false }, onDismissRequest = { showUrlInputDialog = false },
onConfirm = { onConfirm = {
showUrlInputDialog = false showUrlInputDialog = false
@ -134,7 +129,7 @@ fun BaseBundleDialog(
showUrlInputDialog = true showUrlInputDialog = true
} }
), ),
headlineText = stringResource(R.string.patches_url), headlineText = stringResource(R.string.bundle_input_source_url),
supportingText = url.ifEmpty { supportingText = url.ifEmpty {
stringResource(R.string.field_not_set) stringResource(R.string.field_not_set)
} }
@ -144,7 +139,7 @@ fun BaseBundleDialog(
val patchesClickable = patchCount > 0 val patchesClickable = patchCount > 0
BundleListItem( BundleListItem(
headlineText = stringResource(R.string.patches), headlineText = stringResource(R.string.patches),
supportingText = stringResource(R.string.view_patches), supportingText = stringResource(R.string.bundle_view_patches),
modifier = Modifier.clickable( modifier = Modifier.clickable(
enabled = patchesClickable, enabled = patchesClickable,
onClick = onPatchesClick onClick = onPatchesClick
@ -165,34 +160,22 @@ fun BaseBundleDialog(
@Composable @Composable
private fun Tag( private fun Tag(
icon: ImageVector, icon: ImageVector,
text: String, text: String
isUrl: Boolean = false
) { ) {
val uriHandler = LocalUriHandler.current
Row( Row(
horizontalArrangement = Arrangement.spacedBy(6.dp), horizontalArrangement = Arrangement.spacedBy(6.dp),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically
modifier = if (isUrl) {
Modifier
.clickable {
try {
uriHandler.openUri(text)
} catch (_: Exception) {}
}
}
else
Modifier,
) { ) {
Icon( Icon(
imageVector = icon, imageVector = icon,
contentDescription = null, contentDescription = null,
modifier = Modifier.size(16.dp) modifier = Modifier.size(16.dp),
tint = MaterialTheme.colorScheme.outline,
) )
Text( Text(
text, text,
style = MaterialTheme.typography.bodyMedium, style = MaterialTheme.typography.bodyMedium,
color = if(isUrl) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.outline, color = MaterialTheme.colorScheme.outline,
) )
} }
} }

View File

@ -44,14 +44,13 @@ fun BundleInformationDialog(
}.collectAsStateWithLifecycle(null) }.collectAsStateWithLifecycle(null)
val patchCount by bundle.patchCountFlow.collectAsStateWithLifecycle(0) val patchCount by bundle.patchCountFlow.collectAsStateWithLifecycle(0)
val version by bundle.versionFlow.collectAsStateWithLifecycle(null) val version by bundle.versionFlow.collectAsStateWithLifecycle(null)
val bundleManifestAttributes = state.patchBundleOrNull()?.patchBundleManifestAttributes
if (viewCurrentBundlePatches) { if (viewCurrentBundlePatches) {
BundlePatchesDialog( BundlePatchesDialog(
onDismissRequest = { onDismissRequest = {
viewCurrentBundlePatches = false viewCurrentBundlePatches = false
}, },
bundle = bundle bundle = bundle,
) )
} }
@ -63,7 +62,7 @@ fun BundleInformationDialog(
Scaffold( Scaffold(
topBar = { topBar = {
BundleTopBar( BundleTopBar(
title = bundleName, title = stringResource(R.string.patch_bundle_field),
onBackClick = onDismissRequest, onBackClick = onDismissRequest,
backIcon = { backIcon = {
Icon( Icon(
@ -95,11 +94,11 @@ fun BundleInformationDialog(
BaseBundleDialog( BaseBundleDialog(
modifier = Modifier.padding(paddingValues), modifier = Modifier.padding(paddingValues),
isDefault = bundle.isDefault, isDefault = bundle.isDefault,
name = bundleName,
remoteUrl = bundle.asRemoteOrNull?.endpoint, remoteUrl = bundle.asRemoteOrNull?.endpoint,
patchCount = patchCount, patchCount = patchCount,
version = version, version = version,
autoUpdate = props?.autoUpdate == true, autoUpdate = props?.autoUpdate == true,
bundleManifestAttributes = bundleManifestAttributes,
onAutoUpdateChange = { onAutoUpdateChange = {
composableScope.launch { composableScope.launch {
bundle.asRemoteOrNull?.setAutoUpdate(it) bundle.asRemoteOrNull?.setAutoUpdate(it)
@ -119,8 +118,8 @@ fun BundleInformationDialog(
) )
BundleListItem( BundleListItem(
headlineText = stringResource(R.string.patches_error), headlineText = stringResource(R.string.bundle_error),
supportingText = stringResource(R.string.patches_error_description), supportingText = stringResource(R.string.bundle_error_description),
trailingContent = { trailingContent = {
Icon( Icon(
Icons.AutoMirrored.Outlined.ArrowRight, Icons.AutoMirrored.Outlined.ArrowRight,
@ -133,8 +132,8 @@ fun BundleInformationDialog(
if (state is PatchBundleSource.State.Missing && !isLocal) { if (state is PatchBundleSource.State.Missing && !isLocal) {
BundleListItem( BundleListItem(
headlineText = stringResource(R.string.patches_error), headlineText = stringResource(R.string.bundle_error),
supportingText = stringResource(R.string.patches_not_downloaded), supportingText = stringResource(R.string.bundle_not_downloaded),
modifier = Modifier.clickable(onClick = onUpdate) modifier = Modifier.clickable(onClick = onUpdate)
) )
} }

View File

@ -67,8 +67,8 @@ fun BundleItem(
onDelete() onDelete()
viewBundleDialogPage = false viewBundleDialogPage = false
}, },
title = stringResource(R.string.delete), title = stringResource(R.string.bundle_delete_single_dialog_title),
description = stringResource(R.string.patches_delete_single_dialog_description, name), description = stringResource(R.string.bundle_delete_single_dialog_description, name),
icon = Icons.Outlined.Delete icon = Icons.Outlined.Delete
) )
} }
@ -100,8 +100,8 @@ fun BundleItem(
Row { Row {
val icon = remember(state) { val icon = remember(state) {
when (state) { when (state) {
is PatchBundleSource.State.Failed -> Icons.Outlined.ErrorOutline to R.string.patches_error is PatchBundleSource.State.Failed -> Icons.Outlined.ErrorOutline to R.string.bundle_error
is PatchBundleSource.State.Missing -> Icons.Outlined.Warning to R.string.patches_missing is PatchBundleSource.State.Missing -> Icons.Outlined.Warning to R.string.bundle_missing
is PatchBundleSource.State.Loaded -> null is PatchBundleSource.State.Loaded -> null
} }
} }

View File

@ -46,7 +46,7 @@ fun BundlePatchesDialog(
Scaffold( Scaffold(
topBar = { topBar = {
BundleTopBar( BundleTopBar(
title = stringResource(R.string.patches), title = stringResource(R.string.bundle_patches),
onBackClick = onDismissRequest, onBackClick = onDismissRequest,
backIcon = { backIcon = {
Icon( Icon(
@ -133,10 +133,10 @@ fun PatchItem(
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
PatchInfoChip( PatchInfoChip(
text = "$PACKAGE_ICON ${stringResource(R.string.patches_view_any_package)}" text = "$PACKAGE_ICON ${stringResource(R.string.bundle_view_patches_any_package)}"
) )
PatchInfoChip( PatchInfoChip(
text = "$VERSION_ICON ${stringResource(R.string.patches_view_any_version)}" text = "$VERSION_ICON ${stringResource(R.string.bundle_view_patches_any_version)}"
) )
} }
} else { } else {

View File

@ -13,14 +13,14 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import app.revanced.manager.R
import app.revanced.manager.domain.bundles.PatchBundleSource import app.revanced.manager.domain.bundles.PatchBundleSource
import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.nameState import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.nameState
import kotlinx.coroutines.flow.map
@OptIn(ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class)
@Composable @Composable
@ -50,7 +50,7 @@ fun BundleSelector(bundles: List<PatchBundleSource>, onFinish: (PatchBundleSourc
.fillMaxWidth() .fillMaxWidth()
) { ) {
Text( Text(
text = stringResource(R.string.select), text = "Select bundle",
style = MaterialTheme.typography.titleLarge, style = MaterialTheme.typography.titleLarge,
color = MaterialTheme.colorScheme.onSurface color = MaterialTheme.colorScheme.onSurface
) )

View File

@ -77,7 +77,7 @@ fun ImportPatchBundleDialog(
AlertDialogExtended( AlertDialogExtended(
onDismissRequest = onDismiss, onDismissRequest = onDismiss,
title = { title = {
Text(stringResource(if (currentStep == 0) R.string.select else R.string.add_patches)) Text(stringResource(if (currentStep == 0) R.string.select else R.string.add_patch_bundle))
}, },
text = { text = {
steps[currentStep]() steps[currentStep]()
@ -126,7 +126,7 @@ fun SelectBundleTypeStep(
) { ) {
Text( Text(
modifier = Modifier.padding(horizontal = 24.dp), modifier = Modifier.padding(horizontal = 24.dp),
text = stringResource(R.string.select_patches_type_dialog_description) text = stringResource(R.string.select_bundle_type_dialog_description)
) )
Column { Column {
ListItem( ListItem(
@ -136,7 +136,7 @@ fun SelectBundleTypeStep(
), ),
headlineContent = { Text(stringResource(R.string.enter_url)) }, headlineContent = { Text(stringResource(R.string.enter_url)) },
overlineContent = { Text(stringResource(R.string.recommended)) }, overlineContent = { Text(stringResource(R.string.recommended)) },
supportingContent = { Text(stringResource(R.string.remote_patches_description)) }, supportingContent = { Text(stringResource(R.string.remote_bundle_description)) },
leadingContent = { leadingContent = {
HapticRadioButton( HapticRadioButton(
selected = bundleType == BundleType.Remote, selected = bundleType == BundleType.Remote,
@ -152,7 +152,7 @@ fun SelectBundleTypeStep(
onClick = { onBundleTypeSelected(BundleType.Local) } onClick = { onBundleTypeSelected(BundleType.Local) }
), ),
headlineContent = { Text(stringResource(R.string.select_from_storage)) }, headlineContent = { Text(stringResource(R.string.select_from_storage)) },
supportingContent = { Text(stringResource(R.string.local_patches_description)) }, supportingContent = { Text(stringResource(R.string.local_bundle_description)) },
overlineContent = { }, overlineContent = { },
leadingContent = { leadingContent = {
HapticRadioButton( HapticRadioButton(
@ -185,7 +185,7 @@ fun ImportBundleStep(
) { ) {
ListItem( ListItem(
headlineContent = { headlineContent = {
Text(stringResource(R.string.patches)) Text(stringResource(R.string.patch_bundle_field))
}, },
supportingContent = { Text(stringResource(if (patchBundle != null) R.string.file_field_set else R.string.file_field_not_set)) }, supportingContent = { Text(stringResource(if (patchBundle != null) R.string.file_field_set else R.string.file_field_not_set)) },
trailingContent = { trailingContent = {
@ -206,11 +206,11 @@ fun ImportBundleStep(
OutlinedTextField( OutlinedTextField(
value = remoteUrl, value = remoteUrl,
onValueChange = onRemoteUrlChange, onValueChange = onRemoteUrlChange,
label = { Text(stringResource(R.string.patches_url)) } label = { Text(stringResource(R.string.bundle_url)) }
) )
} }
Column( Column(
modifier = Modifier.padding(horizontal = 8.dp, vertical = 5.dp) modifier = Modifier.padding(horizontal = 8.dp)
) { ) {
ListItem( ListItem(
modifier = Modifier.clickable( modifier = Modifier.clickable(

View File

@ -9,7 +9,6 @@ import androidx.compose.material3.SwitchDefaults
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalView
@Composable @Composable
fun HapticSwitch( fun HapticSwitch(
@ -21,19 +20,16 @@ fun HapticSwitch(
colors: SwitchColors = SwitchDefaults.colors(), colors: SwitchColors = SwitchDefaults.colors(),
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
) { ) {
val view = LocalView.current
Switch( Switch(
checked = checked, checked = checked,
onCheckedChange = { newChecked -> onCheckedChange = { newChecked ->
val useNewConstants = Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE val useNewConstants = Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE
val hapticFeedbackType = when { when {
newChecked && useNewConstants -> HapticFeedbackConstants.TOGGLE_ON newChecked && useNewConstants -> HapticFeedbackConstants.TOGGLE_ON
newChecked -> HapticFeedbackConstants.VIRTUAL_KEY newChecked -> HapticFeedbackConstants.VIRTUAL_KEY
!newChecked && useNewConstants -> HapticFeedbackConstants.TOGGLE_OFF !newChecked && useNewConstants -> HapticFeedbackConstants.TOGGLE_OFF
!newChecked -> HapticFeedbackConstants.CLOCK_TICK !newChecked -> HapticFeedbackConstants.CLOCK_TICK
else -> {HapticFeedbackConstants.VIRTUAL_KEY}
} }
view.performHapticFeedback(hapticFeedbackType)
onCheckedChange(newChecked) onCheckedChange(newChecked)
}, },
modifier = modifier, modifier = modifier,

View File

@ -23,6 +23,8 @@ data class BundleInfo(
yieldAll(universal) yieldAll(universal)
} }
val patchCount get() = compatible.size + incompatible.size + universal.size
fun patchSequence(allowIncompatible: Boolean) = if (allowIncompatible) { fun patchSequence(allowIncompatible: Boolean) = if (allowIncompatible) {
all all
} else { } else {
@ -77,7 +79,7 @@ data class BundleInfo(
targetList.add(it) targetList.add(it)
} }
BundleInfo(source.getName(), bundle.patchBundleManifestAttributes?.version, source.uid, compatible, incompatible, universal) BundleInfo(source.getName(), bundle.readManifestAttribute("Version"), source.uid, compatible, incompatible, universal)
} }
} }

View File

@ -79,7 +79,7 @@ enum class DashboardPage(
val icon: ImageVector val icon: ImageVector
) { ) {
DASHBOARD(R.string.tab_apps, Icons.Outlined.Apps), DASHBOARD(R.string.tab_apps, Icons.Outlined.Apps),
BUNDLES(R.string.tab_patches, Icons.Outlined.Source), BUNDLES(R.string.tab_bundles, Icons.Outlined.Source),
} }
@SuppressLint("BatteryLife") @SuppressLint("BatteryLife")
@ -93,7 +93,7 @@ fun DashboardScreen(
onDownloaderPluginClick: () -> Unit, onDownloaderPluginClick: () -> Unit,
onAppClick: (String) -> Unit onAppClick: (String) -> Unit
) { ) {
val bundlesSelectable by remember { derivedStateOf { vm.selectedSources.isNotEmpty() } } val bundlesSelectable by remember { derivedStateOf { vm.selectedSources.size > 0 } }
val availablePatches by vm.availablePatches.collectAsStateWithLifecycle(0) val availablePatches by vm.availablePatches.collectAsStateWithLifecycle(0)
val showNewDownloaderPluginsNotification by vm.newDownloaderPluginsAvailable.collectAsStateWithLifecycle( val showNewDownloaderPluginsNotification by vm.newDownloaderPluginsAvailable.collectAsStateWithLifecycle(
false false
@ -164,8 +164,8 @@ fun DashboardScreen(
vm.selectedSources.forEach { if (!it.isDefault) vm.delete(it) } vm.selectedSources.forEach { if (!it.isDefault) vm.delete(it) }
vm.cancelSourceSelection() vm.cancelSourceSelection()
}, },
title = stringResource(R.string.delete), title = stringResource(R.string.bundle_delete_multiple_dialog_title),
description = stringResource(R.string.patches_delete_multiple_dialog_description), description = stringResource(R.string.bundle_delete_multiple_dialog_description),
icon = Icons.Outlined.Delete icon = Icons.Outlined.Delete
) )
} }
@ -174,7 +174,7 @@ fun DashboardScreen(
topBar = { topBar = {
if (bundlesSelectable) { if (bundlesSelectable) {
BundleTopBar( BundleTopBar(
title = stringResource(R.string.patches_selected, vm.selectedSources.size), title = stringResource(R.string.bundles_selected, vm.selectedSources.size),
onBackClick = vm::cancelSourceSelection, onBackClick = vm::cancelSourceSelection,
backIcon = { backIcon = {
Icon( Icon(
@ -239,7 +239,7 @@ fun DashboardScreen(
when (pagerState.currentPage) { when (pagerState.currentPage) {
DashboardPage.DASHBOARD.ordinal -> { DashboardPage.DASHBOARD.ordinal -> {
if (availablePatches < 1) { if (availablePatches < 1) {
androidContext.toast(androidContext.getString(R.string.no_patch_found)) androidContext.toast(androidContext.getString(R.string.patches_unavailable))
composableScope.launch { composableScope.launch {
pagerState.animateScrollToPage( pagerState.animateScrollToPage(
DashboardPage.BUNDLES.ordinal DashboardPage.BUNDLES.ordinal

View File

@ -389,7 +389,6 @@ fun PatchesSelectorScreen(
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
.padding(paddingValues) .padding(paddingValues)
.padding(top = 16.dp)
) { ) {
if (bundles.size > 1) { if (bundles.size > 1) {
ScrollableTabRow( ScrollableTabRow(

View File

@ -48,13 +48,13 @@ fun DeveloperSettingsScreen(
description = R.string.developer_options_description, description = R.string.developer_options_description,
) )
GroupHeader(stringResource(R.string.patches)) GroupHeader(stringResource(R.string.patch_bundles_section))
SettingsListItem( SettingsListItem(
headlineContent = stringResource(R.string.patches_force_download), headlineContent = stringResource(R.string.patch_bundles_force_download),
modifier = Modifier.clickable(onClick = vm::redownloadBundles) modifier = Modifier.clickable(onClick = vm::redownloadBundles)
) )
SettingsListItem( SettingsListItem(
headlineContent = stringResource(R.string.patches_reset), headlineContent = stringResource(R.string.patch_bundles_reset),
modifier = Modifier.clickable(onClick = vm::redownloadBundles) modifier = Modifier.clickable(onClick = vm::redownloadBundles)
) )
} }

View File

@ -240,8 +240,8 @@ fun ImportExportSettingsScreen(
} }
} }
}, },
headline = R.string.patch_selection_reset_patches, headline = R.string.patch_selection_reset_bundle,
description = R.string.patch_selection_reset_patches_description description = R.string.patch_selection_reset_bundle_description
) )
} }
} }
@ -296,8 +296,8 @@ fun ImportExportSettingsScreen(
} }
} }
}, },
headline = R.string.patch_options_reset, headline = R.string.patch_options_reset_bundle,
description = R.string.patch_options_reset_all, description = R.string.patch_options_reset_bundle_description,
) )
} }
} }

View File

@ -16,7 +16,6 @@ import androidx.compose.ui.res.stringResource
import app.revanced.manager.R import app.revanced.manager.R
import app.revanced.manager.ui.component.AppTopBar import app.revanced.manager.ui.component.AppTopBar
import app.revanced.manager.ui.component.ColumnWithScrollbar 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.BooleanItem
import app.revanced.manager.ui.component.settings.SettingsListItem import app.revanced.manager.ui.component.settings.SettingsListItem
import app.revanced.manager.ui.viewmodel.UpdatesSettingsViewModel import app.revanced.manager.ui.viewmodel.UpdatesSettingsViewModel
@ -51,8 +50,6 @@ fun UpdatesSettingsScreen(
.fillMaxSize() .fillMaxSize()
.padding(paddingValues) .padding(paddingValues)
) { ) {
GroupHeader(stringResource(R.string.manager))
SettingsListItem( SettingsListItem(
modifier = Modifier.clickable { modifier = Modifier.clickable {
coroutineScope.launch { coroutineScope.launch {

View File

@ -135,13 +135,13 @@ class DashboardViewModel(
uiSafe( uiSafe(
app, app,
R.string.patches_download_fail, R.string.source_download_fail,
RemotePatchBundle.updateFailMsg RemotePatchBundle.updateFailMsg
) { ) {
if (bundle.update()) if (bundle.update())
app.toast(app.getString(R.string.patches_update_success, bundle.getName())) app.toast(app.getString(R.string.bundle_update_success, bundle.getName()))
else else
app.toast(app.getString(R.string.patches_update_unavailable, bundle.getName())) app.toast(app.getString(R.string.bundle_update_unavailable, bundle.getName()))
} }
} }
} }

View File

@ -16,7 +16,7 @@ class DeveloperOptionsViewModel(
private val patchBundleRepository: PatchBundleRepository private val patchBundleRepository: PatchBundleRepository
) : ViewModel() { ) : ViewModel() {
fun redownloadBundles() = viewModelScope.launch { fun redownloadBundles() = viewModelScope.launch {
uiSafe(app, R.string.patches_download_fail, RemotePatchBundle.updateFailMsg) { uiSafe(app, R.string.source_download_fail, RemotePatchBundle.updateFailMsg) {
patchBundleRepository.redownloadRemoteBundles() patchBundleRepository.redownloadRemoteBundles()
} }
} }

View File

@ -61,8 +61,8 @@ sealed class ResetDialogState(
) )
class PatchSelectionBundle(dialogOptionName: String, onConfirm: () -> Unit) : ResetDialogState( class PatchSelectionBundle(dialogOptionName: String, onConfirm: () -> Unit) : ResetDialogState(
titleResId = R.string.patch_selection_reset_patches, titleResId = R.string.patch_selection_reset_bundle,
descriptionResId = R.string.patch_selection_reset_patches_dialog_description, descriptionResId = R.string.patch_selection_reset_bundle_dialog_description,
onConfirm = onConfirm, onConfirm = onConfirm,
dialogOptionName = dialogOptionName dialogOptionName = dialogOptionName
) )
@ -81,8 +81,8 @@ sealed class ResetDialogState(
) )
class PatchOptionBundle(dialogOptionName: String, onConfirm: () -> Unit) : ResetDialogState( class PatchOptionBundle(dialogOptionName: String, onConfirm: () -> Unit) : ResetDialogState(
titleResId = R.string.patch_options_reset, titleResId = R.string.patch_options_reset_bundle,
descriptionResId = R.string.patch_options_reset_dialog_description, descriptionResId = R.string.patch_options_reset_bundle_dialog_description,
onConfirm = onConfirm, onConfirm = onConfirm,
dialogOptionName = dialogOptionName dialogOptionName = dialogOptionName
) )

View File

@ -14,24 +14,26 @@
<string name="dashboard">Dashboard</string> <string name="dashboard">Dashboard</string>
<string name="settings">Settings</string> <string name="settings">Settings</string>
<string name="select_app">Select an app</string> <string name="select_app">Select an app</string>
<string name="patches_count_selected">%1$d/%2$d selected</string> <string name="patches_selected">%1$d/%2$d selected</string>
<string name="new_downloader_plugins_notification">New downloader plugins available. Click here to configure them.</string> <string name="new_downloader_plugins_notification">New downloader plugins available. Click here to configure them.</string>
<string name="unsupported_architecture_warning">Patching on this device architecture is unsupported and will most likely fail.</string> <string name="unsupported_architecture_warning">Patching on this device architecture is unsupported and will most likely fail.</string>
<string name="import_">Import</string> <string name="import_">Import</string>
<string name="import_patches">Import patches</string> <string name="import_bundle">Import patch bundle</string>
<string name="bundle_patches">Bundle patches</string>
<string name="patch_bundle_field">Patch bundle</string>
<string name="file_field_set">Selected</string> <string name="file_field_set">Selected</string>
<string name="file_field_not_set">Not selected</string> <string name="file_field_not_set">Not selected</string>
<string name="field_not_set">Not set</string> <string name="field_not_set">Not set</string>
<string name="patches_missing">Missing</string> <string name="bundle_missing">Missing</string>
<string name="patches_error">Error</string> <string name="bundle_error">Error</string>
<string name="patches_error_description">Patches could not be loaded. Click to view the error</string> <string name="bundle_error_description">Bundle could not be loaded. Click to view the error</string>
<string name="patches_not_downloaded">Patches has not been downloaded. Click here to download it</string> <string name="bundle_not_downloaded">Bundle has not been downloaded. Click here to download it</string>
<string name="patches_name_default">Patches</string> <string name="bundle_name_default">Default</string>
<string name="patches_name_fallback">Unnamed</string> <string name="bundle_name_fallback">Unnamed</string>
<string name="android_11_bug_dialog_title">Android 11 bug</string> <string name="android_11_bug_dialog_title">Android 11 bug</string>
<string name="android_11_bug_dialog_description">The app installation permission must be granted ahead of time to avoid a bug in the Android 11 system that will negatively affect the user experience.</string> <string name="android_11_bug_dialog_description">The app installation permission must be granted ahead of time to avoid a bug in the Android 11 system that will negatively affect the user experience.</string>
@ -137,15 +139,16 @@
<string name="patch_selection_reset_package">Reset patch selection for app</string> <string name="patch_selection_reset_package">Reset patch selection for app</string>
<string name="patch_selection_reset_package_dialog_description">You are about to reset the patch selection for the app \"%s\". You will have to manually select each patch again.</string> <string name="patch_selection_reset_package_dialog_description">You are about to reset the patch selection for the app \"%s\". You will have to manually select each patch again.</string>
<string name="patch_selection_reset_package_description">Resets patch selection for a single app</string> <string name="patch_selection_reset_package_description">Resets patch selection for a single app</string>
<string name="patch_selection_reset_patches">Resets patch selection for a specific patches</string> <string name="patch_selection_reset_bundle">Resets patch selection for bundle</string>
<string name="patch_selection_reset_patches_dialog_description">You are about to reset the patch selection for \"%s\". You will have to manually select each patch again.</string> <string name="patch_selection_reset_bundle_dialog_description">You are about to reset the patch selection for the bundle \"%s\". You will have to manually select each patch again.</string>
<string name="patch_selection_reset_patches_description">Resets the patch selection for a specific patches</string> <string name="patch_selection_reset_bundle_description">Resets the patch selection for all patches in a bundle</string>
<string name="patch_options_reset_package">Reset patch options for app</string> <string name="patch_options_reset_package">Reset patch options for app</string>
<string name="patch_options_reset_package_dialog_description">You are about to reset the patch options for the app \"%s\". You will have to reapply each option again.</string> <string name="patch_options_reset_package_dialog_description">You are about to reset the patch options for the app \"%s\". You will have to reapply each option again.</string>
<string name="patch_options_reset_package_description">Resets patch options for a single app</string> <string name="patch_options_reset_package_description">Resets patch options for a single app</string>
<string name="patch_options_reset">Reset patch options</string> <string name="patch_options_reset_bundle">Resets patch options for bundle</string>
<string name="patch_options_reset_dialog_description">You are about to reset the patch options for \"%s\". You will have to reapply each option again.</string> <string name="patch_options_reset_bundle_dialog_description">You are about to reset the patch options for the bundle \"%s\". You will have to reapply each option again.</string>
<string name="patch_options_reset_all">Reset patch options for all</string> <string name="patch_options_reset_bundle_description">Resets patch options for all patches in a bundle</string>
<string name="patch_options_reset_all">Reset patch options</string>
<string name="patch_options_reset_all_dialog_description">You are about to reset patch options. You will have to reapply each option again.</string> <string name="patch_options_reset_all_dialog_description">You are about to reset patch options. You will have to reapply each option again.</string>
<string name="patch_options_reset_all_description">Resets all patch options</string> <string name="patch_options_reset_all_description">Resets all patch options</string>
<string name="downloader_plugins">Plugins</string> <string name="downloader_plugins">Plugins</string>
@ -161,7 +164,7 @@
<string name="search_apps">Search apps…</string> <string name="search_apps">Search apps…</string>
<string name="loading_body">Loading…</string> <string name="loading_body">Loading…</string>
<string name="downloading_patches">Downloading patches</string> <string name="downloading_patches">Downloading patch bundle…</string>
<string name="options">Options</string> <string name="options">Options</string>
<string name="ok">OK</string> <string name="ok">OK</string>
@ -199,8 +202,8 @@
<string name="debug_logs_export_success">Exported logs</string> <string name="debug_logs_export_success">Exported logs</string>
<string name="api_url">API URL</string> <string name="api_url">API URL</string>
<string name="api_url_description">The API used to download necessary files.</string> <string name="api_url_description">The API used to download necessary files.</string>
<string name="api_url_dialog_title">Change API URL</string> <string name="api_url_dialog_title">Set custom API URL</string>
<string name="api_url_dialog_description">Change the API URL of ReVanced Manager. ReVanced Manager uses the API to download patches and updates.</string> <string name="api_url_dialog_description">Set the API URL of ReVanced Manager. ReVanced Manager uses the API to download patches and updates.</string>
<string name="api_url_dialog_warning">ReVanced Manager connects to the API to download patches and updates. Make sure that you trust it.</string> <string name="api_url_dialog_warning">ReVanced Manager connects to the API to download patches and updates. Make sure that you trust it.</string>
<string name="api_url_dialog_save">Set</string> <string name="api_url_dialog_save">Set</string>
<string name="api_url_dialog_reset">Reset API URL</string> <string name="api_url_dialog_reset">Reset API URL</string>
@ -210,25 +213,26 @@
<string name="device_architectures">CPU Architectures</string> <string name="device_architectures">CPU Architectures</string>
<string name="device_memory_limit">Memory limits</string> <string name="device_memory_limit">Memory limits</string>
<string name="device_memory_limit_format">%1$dMB (Normal) - %2$dMB (Large)</string> <string name="device_memory_limit_format">%1$dMB (Normal) - %2$dMB (Large)</string>
<string name="patches_force_download">Force download all patches</string> <string name="patch_bundles_section">Patch bundles</string>
<string name="patches_reset">Reset patches</string> <string name="patch_bundles_force_download">Force download all patch bundles</string>
<string name="patch_bundles_reset">Reset patch bundles</string>
<string name="patching">Patching</string> <string name="patching">Patching</string>
<string name="signing">Signing</string> <string name="signing">Signing</string>
<string name="storage">Storage</string> <string name="storage">Storage</string>
<string name="no_patch_found">No patch can be found. Check your patches</string> <string name="patches_unavailable">No patches are available. Check your bundles</string>
<string name="tab_apps">Apps</string> <string name="tab_apps">Apps</string>
<string name="tab_patches">Patches</string> <string name="tab_bundles">Patch bundles</string>
<string name="delete">Delete</string> <string name="delete">Delete</string>
<string name="refresh">Refresh</string> <string name="refresh">Refresh</string>
<string name="continue_anyways">Continue anyways</string> <string name="continue_anyways">Continue anyways</string>
<string name="download_another_version">Download another version</string> <string name="download_another_version">Download another version</string>
<string name="download_app">Download app</string> <string name="download_app">Download app</string>
<string name="download_apk">Download APK file</string> <string name="download_apk">Download APK file</string>
<string name="patches_download_fail">Failed to download patches: %s</string> <string name="source_download_fail">Failed to download patch bundle: %s</string>
<string name="patches_replace_fail">Failed to load updated patches: %s</string> <string name="source_replace_fail">Failed to load updated patch bundle: %s</string>
<string name="no_patched_apps_found">No patched apps found</string> <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="tap_on_patches">Tap on the patches to get more information about them</string>
<string name="patches_selected">%s selected</string> <string name="bundles_selected">%s selected</string>
<string name="incompatible_patches">Incompatible patches</string> <string name="incompatible_patches">Incompatible patches</string>
<string name="universal_patches">Universal 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_selection_reset_toast">Patch selection and options has been reset to recommended defaults</string>
@ -313,8 +317,7 @@
<string name="patcher_step_group_saving">Saving</string> <string name="patcher_step_group_saving">Saving</string>
<string name="patcher_step_write_patched">Write patched APK file</string> <string name="patcher_step_write_patched">Write patched APK file</string>
<string name="patcher_step_sign_apk">Sign patched APK file</string> <string name="patcher_step_sign_apk">Sign patched APK file</string>
<string name="patcher_notification_title">Patching in progress…</string> <string name="patcher_notification_message">Patching in progress…</string>
<string name="patcher_notification_text">Tap to return to the patcher</string>
<string name="patcher_stop_confirm_title">Stop patcher</string> <string name="patcher_stop_confirm_title">Stop patcher</string>
<string name="patcher_stop_confirm_description">Are you sure you want to stop the patching process?</string> <string name="patcher_stop_confirm_description">Are you sure you want to stop the patching process?</string>
<string name="execute_patches">Execute patches</string> <string name="execute_patches">Execute patches</string>
@ -344,13 +347,19 @@
<string name="submit_feedback_description">Help us improve this application</string> <string name="submit_feedback_description">Help us improve this application</string>
<string name="developer_options">Developer options</string> <string name="developer_options">Developer options</string>
<string name="developer_options_description">Options for debugging issues</string> <string name="developer_options_description">Options for debugging issues</string>
<string name="patches_update_success">Successfully updated %s</string> <string name="bundle_input_source_url">Source URL</string>
<string name="patches_update_unavailable">No update available for %s</string> <string name="bundle_update_success">Successfully updated %s</string>
<string name="view_patches">View patches</string> <string name="bundle_update_unavailable">No update available for %s</string>
<string name="patches_view_any_version">Any version</string> <string name="bundle_auto_update">Auto update</string>
<string name="patches_view_any_package">Any package</string> <string name="bundle_auto_update_description">Automatically update this bundle when ReVanced starts</string>
<string name="patches_delete_single_dialog_description">Are you sure you want to delete \"%s\"?</string> <string name="bundle_view_patches">View patches</string>
<string name="patches_delete_multiple_dialog_description">Are you sure you want to delete the selected patches?</string> <string name="bundle_view_patches_any_version">Any version</string>
<string name="bundle_view_patches_any_package">Any package</string>
<string name="bundle_delete_single_dialog_title">Delete bundle</string>
<string name="bundle_delete_multiple_dialog_title">Delete bundles</string>
<string name="bundle_delete_single_dialog_description">Are you sure you want to delete the bundle \"%s\"?</string>
<string name="bundle_delete_multiple_dialog_description">Are you sure you want to delete the selected bundles?</string>
<string name="about_revanced_manager">About ReVanced Manager</string> <string name="about_revanced_manager">About ReVanced Manager</string>
<string name="revanced_manager_description">ReVanced Manager is an Android application that uses ReVanced Patcher to patch Android apps. It allows you to download and patch apps with custom patches, and manage the patching process.</string> <string name="revanced_manager_description">ReVanced Manager is an Android application that uses ReVanced Patcher to patch Android apps. It allows you to download and patch apps with custom patches, and manage the patching process.</string>
@ -404,9 +413,10 @@
<string name="no_contributors_found">No contributors found</string> <string name="no_contributors_found">No contributors found</string>
<string name="select">Select</string> <string name="select">Select</string>
<string name="select_deselect_all">Select or deselect all</string> <string name="select_deselect_all">Select or deselect all</string>
<string name="select_patches_type_dialog_description">Add new patches from URL or local files</string> <string name="select_bundle_type_dialog_title">Add new bundle</string>
<string name="local_patches_description">Add patches from local storage.</string> <string name="select_bundle_type_dialog_description">Add a new bundle from a URL or storage</string>
<string name="remote_patches_description">Add patches from URL. Patches can automatically update.</string> <string name="local_bundle_description">Import local files from your storage, does not automatically update</string>
<string name="remote_bundle_description">Import remote files from a URL, can automatically update</string>
<string name="recommended">Recommended</string> <string name="recommended">Recommended</string>
<string name="installation_failed_dialog_title">Installation failed</string> <string name="installation_failed_dialog_title">Installation failed</string>
@ -431,10 +441,9 @@
<string name="about_device">About device</string> <string name="about_device">About device</string>
<string name="enter_url">Enter URL</string> <string name="enter_url">Enter URL</string>
<string name="next">Next</string> <string name="next">Next</string>
<string name="add_patch_bundle">Add patch bundle</string>
<string name="bundle_url">Bundle URL</string>
<string name="auto_update">Auto update</string> <string name="auto_update">Auto update</string>
<string name="add_patches">Add patches</string>
<string name="auto_update_description">Automatically update when a new version is available</string>
<string name="patches_url">Patches URL</string>
<string name="incompatible_patches_dialog">These patches are not compatible with the selected app version (%1$s).\n\nClick on the patches to see more details.</string> <string name="incompatible_patches_dialog">These patches are not compatible with the selected app version (%1$s).\n\nClick on the patches to see more details.</string>
<string name="incompatible_patch">Incompatible patch</string> <string name="incompatible_patch">Incompatible patch</string>
<string name="any_version">Any</string> <string name="any_version">Any</string>