fix: display version from manifest

app/src/main/java/app/revanced/manager/domain/bundles/LocalPatchBundle.kt

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

app/src/main/java/app/revanced/manager/domain/bundles/PatchBundleSource.kt

@@ -34,11 +34,11 @@ sealed class PatchBundleSource(initialName: String, val uid: Int, directory: Fil
 
     private val _nameFlow = MutableStateFlow(initialName)
     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()
 
-    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 }
 
     /**
@@ -74,7 +74,7 @@ sealed class PatchBundleSource(initialName: String, val uid: Int, directory: Fil
         val bundle = newState.patchBundleOrNull()
         // Try to read the name from the patch bundle manifest if the bundle does not have a name.
         if (bundle != null && _nameFlow.value.isEmpty()) {
-            bundle.patchBundleManifestAttributes?.name?.let { setName(it) }
+            bundle.readManifestAttribute("Name")?.let { setName(it) }
         }
 
         return bundle

app/src/main/java/app/revanced/manager/domain/bundles/RemotePatchBundle.kt

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

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

@@ -40,8 +40,6 @@ class DownloadedAppRepository(
         data: Parcelable,
         expectedPackageName: String,
         expectedVersion: String?,
-        appCompatibilityCheck: Boolean,
-        patchesCompatibilityCheck: Boolean,
         onDownload: suspend (downloadProgress: Pair<Long, Long?>) -> Unit,
     ): File {
         // 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 =
                 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}")
-            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).
             dao.get(pkgInfo.packageName, pkgInfo.versionName!!)?.directory?.let {

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

@@ -165,7 +165,7 @@ class PatchBundleRepository(
         getBundlesByType<RemotePatchBundle>().forEach { it.downloadLatest() }
 
     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 {
                 if (!networkInfo.isSafe()) {
                     Log.d(tag, "Skipping update check because the network is down or metered.")

app/src/main/java/app/revanced/manager/patcher/patch/PatchBundle.kt

@@ -8,17 +8,6 @@ import java.io.File
 import java.io.IOException
 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) {
     private val loader = object : Iterable<Patch<*>> {
         private fun load(): Iterable<Patch<*>> {
@@ -47,20 +36,7 @@ class PatchBundle(val patchesJar: File) {
         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.

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

@@ -14,9 +14,9 @@ import android.os.Parcelable
 import android.os.PowerManager
 import android.util.Log
 import androidx.activity.result.ActivityResult
+import androidx.core.content.ContextCompat
 import androidx.work.ForegroundInfo
 import androidx.work.WorkerParameters
-import app.revanced.manager.MainActivity
 import app.revanced.manager.R
 import app.revanced.manager.data.platform.Filesystem
 import app.revanced.manager.data.room.apps.installed.InstallType
@@ -88,25 +88,22 @@ class PatcherWorker(
         )
 
     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
         )
         val channel = NotificationChannel(
-            "revanced-patcher-patching", "Patching", NotificationManager.IMPORTANCE_LOW
+            "revanced-patcher-patching", "Patching", NotificationManager.IMPORTANCE_HIGH
         )
         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)
-            .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))
-            .setContentIntent(pendingIntent)
+            .setContentIntent(pendingIntent).build()
-            .setCategory(Notification.CATEGORY_SERVICE)
-            .build()
     }
 
     override suspend fun doWork(): Result {
@@ -161,8 +158,6 @@ class PatcherWorker(
                     data,
                     args.packageName,
                     args.input.version,
-                    prefs.suggestedVersionSafeguard.get(),
-                    !prefs.disablePatchVersionCompatCheck.get(),
                     onDownload = args.onDownloadProgress
                 ).also {
                     args.setInputFile(it)

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

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

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

@@ -2,26 +2,13 @@ package app.revanced.manager.ui.component.bundle
 
 import android.webkit.URLUtil
 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.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.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.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -30,11 +17,10 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 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.TextInputDialog
 import app.revanced.manager.ui.component.haptics.HapticSwitch
@@ -43,12 +29,12 @@ import app.revanced.manager.ui.component.haptics.HapticSwitch
 fun BaseBundleDialog(
     modifier: Modifier = Modifier,
     isDefault: Boolean,
+    name: String?,
     remoteUrl: String?,
     onRemoteUrlChange: ((String) -> Unit)? = null,
     patchCount: Int,
     version: String?,
     autoUpdate: Boolean,
-    bundleManifestAttributes: PatchBundleManifestAttributes?,
     onAutoUpdateChange: (Boolean) -> Unit,
     onPatchesClick: () -> Unit,
     extraFields: @Composable ColumnScope.() -> Unit = {}
@@ -61,27 +47,36 @@ fun BaseBundleDialog(
         Column(
             modifier = Modifier.padding(16.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 {
                     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) {
             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 = {
                     HapticSwitch(
                         checked = autoUpdate,
@@ -113,7 +108,7 @@ fun BaseBundleDialog(
             if (showUrlInputDialog) {
                 TextInputDialog(
                     initial = url,
-                    title = stringResource(R.string.patches_url),
+                    title = stringResource(R.string.bundle_input_source_url),
                     onDismissRequest = { showUrlInputDialog = false },
                     onConfirm = {
                         showUrlInputDialog = false
@@ -134,7 +129,7 @@ fun BaseBundleDialog(
                         showUrlInputDialog = true
                     }
                 ),
-                headlineText = stringResource(R.string.patches_url),
+                headlineText = stringResource(R.string.bundle_input_source_url),
                 supportingText = url.ifEmpty {
                     stringResource(R.string.field_not_set)
                 }
@@ -144,7 +139,7 @@ fun BaseBundleDialog(
         val patchesClickable = patchCount > 0
         BundleListItem(
             headlineText = stringResource(R.string.patches),
-            supportingText = stringResource(R.string.view_patches),
+            supportingText = stringResource(R.string.bundle_view_patches),
             modifier = Modifier.clickable(
                 enabled = patchesClickable,
                 onClick = onPatchesClick
@@ -165,34 +160,22 @@ fun BaseBundleDialog(
 @Composable
 private fun Tag(
     icon: ImageVector,
-    text: String,
+    text: String
-    isUrl: Boolean = false
 ) {
-    val uriHandler = LocalUriHandler.current
-
     Row(
         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(
             imageVector = icon,
             contentDescription = null,
-            modifier = Modifier.size(16.dp)
+            modifier = Modifier.size(16.dp),
+            tint = MaterialTheme.colorScheme.outline,
         )
         Text(
             text,
             style = MaterialTheme.typography.bodyMedium,
-            color = if(isUrl) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.outline,
+            color = MaterialTheme.colorScheme.outline,
         )
     }
 }

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

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

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

@@ -67,8 +67,8 @@ fun BundleItem(
                 onDelete()
                 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
         )
     }
@@ -100,8 +100,8 @@ fun BundleItem(
             Row {
                 val icon = remember(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
                     }
                 }

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

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

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

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

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

@@ -77,7 +77,7 @@ fun ImportPatchBundleDialog(
     AlertDialogExtended(
         onDismissRequest = onDismiss,
         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 = {
             steps[currentStep]()
@@ -126,7 +126,7 @@ fun SelectBundleTypeStep(
     ) {
         Text(
             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 {
             ListItem(
@@ -136,7 +136,7 @@ fun SelectBundleTypeStep(
                 ),
                 headlineContent = { Text(stringResource(R.string.enter_url)) },
                 overlineContent = { Text(stringResource(R.string.recommended)) },
-                supportingContent = { Text(stringResource(R.string.remote_patches_description)) },
+                supportingContent = { Text(stringResource(R.string.remote_bundle_description)) },
                 leadingContent = {
                     HapticRadioButton(
                         selected = bundleType == BundleType.Remote,
@@ -152,7 +152,7 @@ fun SelectBundleTypeStep(
                     onClick = { onBundleTypeSelected(BundleType.Local) }
                 ),
                 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 = { },
                 leadingContent = {
                     HapticRadioButton(
@@ -185,7 +185,7 @@ fun ImportBundleStep(
                 ) {
                     ListItem(
                         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)) },
                         trailingContent = {
@@ -206,11 +206,11 @@ fun ImportBundleStep(
                     OutlinedTextField(
                         value = remoteUrl,
                         onValueChange = onRemoteUrlChange,
-                        label = { Text(stringResource(R.string.patches_url)) }
+                        label = { Text(stringResource(R.string.bundle_url)) }
                     )
                 }
                 Column(
-                    modifier = Modifier.padding(horizontal = 8.dp, vertical = 5.dp)
+                    modifier = Modifier.padding(horizontal = 8.dp)
                 ) {
                     ListItem(
                         modifier = Modifier.clickable(

app/src/main/java/app/revanced/manager/ui/component/haptics/HapticSwitch.kt

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

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

@@ -23,6 +23,8 @@ data class BundleInfo(
         yieldAll(universal)
     }
 
+    val patchCount get() = compatible.size + incompatible.size + universal.size
+
     fun patchSequence(allowIncompatible: Boolean) = if (allowIncompatible) {
         all
     } else {
@@ -77,7 +79,7 @@ data class BundleInfo(
                         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)
                 }
             }
 

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

@@ -79,7 +79,7 @@ enum class DashboardPage(
     val icon: ImageVector
 ) {
     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")
@@ -93,7 +93,7 @@ fun DashboardScreen(
     onDownloaderPluginClick: () -> 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 showNewDownloaderPluginsNotification by vm.newDownloaderPluginsAvailable.collectAsStateWithLifecycle(
         false
@@ -164,8 +164,8 @@ fun DashboardScreen(
                 vm.selectedSources.forEach { if (!it.isDefault) vm.delete(it) }
                 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
         )
     }
@@ -174,7 +174,7 @@ fun DashboardScreen(
         topBar = {
             if (bundlesSelectable) {
                 BundleTopBar(
-                    title = stringResource(R.string.patches_selected, vm.selectedSources.size),
+                    title = stringResource(R.string.bundles_selected, vm.selectedSources.size),
                     onBackClick = vm::cancelSourceSelection,
                     backIcon = {
                         Icon(
@@ -239,7 +239,7 @@ fun DashboardScreen(
                     when (pagerState.currentPage) {
                         DashboardPage.DASHBOARD.ordinal -> {
                             if (availablePatches < 1) {
-                                androidContext.toast(androidContext.getString(R.string.no_patch_found))
+                                androidContext.toast(androidContext.getString(R.string.patches_unavailable))
                                 composableScope.launch {
                                     pagerState.animateScrollToPage(
                                         DashboardPage.BUNDLES.ordinal

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

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

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

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

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

@@ -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,
                         )
                     }
                 }

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

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

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

@@ -135,13 +135,13 @@ class DashboardViewModel(
 
         uiSafe(
             app,
-            R.string.patches_download_fail,
+            R.string.source_download_fail,
             RemotePatchBundle.updateFailMsg
         ) {
             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
-                app.toast(app.getString(R.string.patches_update_unavailable, bundle.getName()))
+                app.toast(app.getString(R.string.bundle_update_unavailable, bundle.getName()))
         }
     }
 }

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

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

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

@@ -61,8 +61,8 @@ sealed class 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,
         dialogOptionName = dialogOptionName
     )
@@ -81,8 +81,8 @@ sealed class 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,
         dialogOptionName = dialogOptionName
     )

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

@@ -14,24 +14,26 @@
     <string name="dashboard">Dashboard</string>
     <string name="settings">Settings</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="unsupported_architecture_warning">Patching on this device architecture is unsupported and will most likely fail.</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_not_set">Not selected</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_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_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_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_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">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_description">Resets all patch options</string>
     <string name="downloader_plugins">Plugins</string>
@@ -161,7 +164,7 @@
 
     <string name="search_apps">Search apps…</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="ok">OK</string>
@@ -199,8 +202,8 @@
     <string name="debug_logs_export_success">Exported logs</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_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_save">Set</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_memory_limit">Memory limits</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="signing">Signing</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_patches">Patches</string>
+    <string name="tab_bundles">Patch bundles</string>
     <string name="delete">Delete</string>
     <string name="refresh">Refresh</string>
     <string name="continue_anyways">Continue anyways</string>
     <string name="download_another_version">Download another version</string>
     <string name="download_app">Download app</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="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="universal_patches">Universal patches</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_write_patched">Write 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_description">Are you sure you want to stop the patching process?</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="developer_options">Developer options</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="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="select">Select</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="installation_failed_dialog_title">Installation failed</string>
@@ -431,10 +441,9 @@
     <string name="about_device">About device</string>
     <string name="enter_url">Enter URL</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="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_patch">Incompatible patch</string>
     <string name="any_version">Any</string>