Merge f9915c1095 into 4d522664b6

2025-05-11 13:05:37 +02:00 · 2025-05-09 06:35:59 +00:00 · 2025-05-09 06:35:59 +00:00 · 18fe10bec7
commit 18fe10bec7
parent 4d522664b6 f9915c1095
5 changed files with 98 additions and 8 deletions
--- a/app/src/main/java/app/revanced/manager/ui/component/ConfirmDialog.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/ConfirmDialog.kt
@ -0,0 +1,41 @@
+package app.revanced.manager.ui.component
+
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import app.revanced.manager.R
+
+@Composable
+fun ConfirmDialog(
+    onDismiss: () -> Unit,
+    onConfirm: () -> Unit,
+    title: String,
+    description: String,
+    imageVector: ImageVector
+) {
+    AlertDialog(
+        onDismissRequest = onDismiss,
+        dismissButton = {
+            TextButton(onDismiss) {
+                Text(stringResource(R.string.cancel))
+            }
+        },
+        confirmButton = {
+            TextButton(
+                onClick = {
+                    onConfirm()
+                    onDismiss()
+                }
+            ) {
+                Text(stringResource(R.string.confirm))
+            }
+        },
+        title = { Text(title) },
+        icon = { Icon(imageVector, null) },
+        text = { Text(description) }
+    )
+}
--- a/app/src/main/java/app/revanced/manager/ui/component/bundle/BundleItem.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/bundle/BundleItem.kt
@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Delete
 import androidx.compose.material.icons.outlined.ErrorOutline
 import androidx.compose.material.icons.outlined.Warning
 import androidx.compose.material3.Icon
@ -26,8 +27,9 @@ 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.ui.component.haptics.HapticCheckbox
 import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.nameState
+import app.revanced.manager.ui.component.ConfirmDialog
+import app.revanced.manager.ui.component.haptics.HapticCheckbox
 import kotlinx.coroutines.flow.map

@OptIn(ExperimentalFoundationApi::class)
@ -42,6 +44,7 @@ fun BundleItem(
    toggleSelection: (Boolean) -> Unit,
 ) {
    var viewBundleDialogPage by rememberSaveable { mutableStateOf(false) }
+    var showDeleteConfirmationDialog by rememberSaveable { mutableStateOf(false) }
    val state by bundle.state.collectAsStateWithLifecycle()

    val version by remember(bundle) {
@ -52,15 +55,25 @@ fun BundleItem(
    if (viewBundleDialogPage) {
        BundleInformationDialog(
            onDismissRequest = { viewBundleDialogPage = false },
-            onDeleteRequest = {
-                viewBundleDialogPage = false
-                onDelete()
-            },
+            onDeleteRequest = { showDeleteConfirmationDialog = true },
            bundle = bundle,
            onUpdate = onUpdate,
        )
    }

+    if (showDeleteConfirmationDialog) {
+        ConfirmDialog(
+            onDismiss = { showDeleteConfirmationDialog = false },
+            onConfirm = {
+                onDelete()
+                viewBundleDialogPage = false
+            },
+            title = stringResource(R.string.bundle_delete_single_dialog_title),
+            description = stringResource(R.string.bundle_delete_single_dialog_description, name),
+            imageVector = Icons.Outlined.Delete
+        )
+    }
+
    ListItem(
        modifier = Modifier
            .height(64.dp)
--- a/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt
@ -21,6 +21,7 @@ import androidx.compose.material.icons.filled.BatteryAlert
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.outlined.Apps
 import androidx.compose.material.icons.outlined.BugReport
+import androidx.compose.material.icons.outlined.Delete
 import androidx.compose.material.icons.outlined.DeleteOutline
 import androidx.compose.material.icons.outlined.Download
 import androidx.compose.material.icons.outlined.Refresh
@ -62,6 +63,7 @@ import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.AutoUpdatesDialog
 import app.revanced.manager.ui.component.AvailableUpdateDialog
 import app.revanced.manager.ui.component.NotificationCard
+import app.revanced.manager.ui.component.ConfirmDialog
 import app.revanced.manager.ui.component.bundle.BundleTopBar
 import app.revanced.manager.ui.component.bundle.ImportPatchBundleDialog
 import app.revanced.manager.ui.component.haptics.HapticFloatingActionButton
@ -154,6 +156,20 @@ fun DashboardScreen(
        }
    )

+    var showDeleteConfirmationDialog by rememberSaveable { mutableStateOf(false) }
+    if (showDeleteConfirmationDialog) {
+        ConfirmDialog(
+            onDismiss = { showDeleteConfirmationDialog = false },
+            onConfirm = {
+                vm.selectedSources.forEach { if (!it.isDefault) vm.delete(it) }
+                vm.cancelSourceSelection()
+            },
+            title = stringResource(R.string.bundle_delete_multiple_dialog_title),
+            description = stringResource(R.string.bundle_delete_multiple_dialog_description),
+            imageVector = Icons.Outlined.Delete
+        )
+    }
+
    Scaffold(
        topBar = {
            if (bundlesSelectable) {
@ -169,8 +185,7 @@ fun DashboardScreen(
                    actions = {
                        IconButton(
                            onClick = {
-                                vm.selectedSources.forEach { if (!it.isDefault) vm.delete(it) }
-                                vm.cancelSourceSelection()
+                                showDeleteConfirmationDialog = true
                            }
                        ) {
                            Icon(
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/DownloadsSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/DownloadsSettingsScreen.kt
@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Delete
+import androidx.compose.material.icons.outlined.Delete
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
@ -43,6 +44,7 @@ import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.ExceptionViewerDialog
 import app.revanced.manager.ui.component.GroupHeader
 import app.revanced.manager.ui.component.LazyColumnWithScrollbar
+import app.revanced.manager.ui.component.ConfirmDialog
 import app.revanced.manager.ui.component.haptics.HapticCheckbox
 import app.revanced.manager.ui.component.settings.SettingsListItem
 import app.revanced.manager.ui.viewmodel.DownloadsViewModel
@ -59,6 +61,17 @@ fun DownloadsSettingsScreen(
    val downloadedApps by viewModel.downloadedApps.collectAsStateWithLifecycle(emptyList())
    val pluginStates by viewModel.downloaderPluginStates.collectAsStateWithLifecycle()
    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
+    var showDeleteConfirmationDialog by rememberSaveable { mutableStateOf(false) }
+
+    if (showDeleteConfirmationDialog) {
+        ConfirmDialog(
+            onDismiss = { showDeleteConfirmationDialog = false },
+            onConfirm = { viewModel.deleteApps() },
+            title = stringResource(R.string.downloader_plugin_delete_apps_title),
+            description = stringResource(R.string.downloader_plugin_delete_apps_description),
+            imageVector = Icons.Outlined.Delete
+        )
+    }

    Scaffold(
        topBar = {
@ -68,7 +81,7 @@ fun DownloadsSettingsScreen(
                onBackClick = onBackClick,
                actions = {
                    if (viewModel.appSelection.isNotEmpty()) {
-                        IconButton(onClick = { viewModel.deleteApps() }) {
+                        IconButton(onClick = { showDeleteConfirmationDialog = true }) {
                            Icon(Icons.Default.Delete, stringResource(R.string.delete))
                        }
                    }
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -143,6 +143,8 @@
    <string name="downloader_plugin_trust_dialog_title">Trust plugin?</string>
    <string name="downloader_plugin_revoke_trust_dialog_title">Revoke trust?</string>
    <string name="downloader_plugin_trust_dialog_body">Package name: %1$s\nSignature (SHA-256): %2$s</string>
+    <string name="downloader_plugin_delete_apps_title">Delete selected apps</string>
+    <string name="downloader_plugin_delete_apps_description">Are you sure you want to delete the selected apps?</string>
    <string name="downloader_settings_no_apps">No downloaded apps found</string>

    <string name="search_apps">Search apps…</string>
@ -336,6 +338,11 @@
    <string name="bundle_view_patches">View 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 application designed to work with ReVanced Patcher, which allows for long-lasting patches to be created for Android apps. The patching system is designed to automatically work with new versions of apps with minimal maintenance.</string>
@ -425,4 +432,5 @@
    <string name="show_manager_update_dialog_on_launch_description">Shows a popup notification whenever there is a new update available on launch.</string>
    <string name="failed_to_import_keystore">Failed to import keystore</string>
    <string name="export">Export</string>
+    <string name="confirm">Confirm</string>
 </resources>