feat: Add UI nudges to note about pitfalls

oSumAtrIX · oSumAtrIX · commit 9cf2bd660317 · 2026-03-14T19:51:48.000+01:00
diff --git a/app/src/main/java/app/revanced/manager/ui/component/settings/SettingsListItem.kt b/app/src/main/java/app/revanced/manager/ui/component/settings/SettingsListItem.kt
@@ -24,6 +24,7 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.stateDescription
 import androidx.compose.ui.unit.dp
@@ -40,6 +41,7 @@ fun SettingsListItem(
     onLongClickLabel: String? = null,
     overlineContent: @Composable (() -> Unit)? = null,
     supportingContent: String? = null,
+    supportingContentColor: Color = Color.Unspecified,
     leadingContent: @Composable (() -> Unit)? = null,
     trailingContent: @Composable (() -> Unit)? = null,
 ) {
@@ -64,7 +66,14 @@ fun SettingsListItem(
                 }
             }
         },
-        supportingContent = supportingContent?.let { { Text(it) } },
+        supportingContent = supportingContent?.let {
+            {
+                Text(
+                    text = it,
+                    color = supportingContentColor
+                )
+            }
+        },
         verticalAlignment = Alignment.CenterVertically,
     ) {
         Text(headlineContent)
@@ -81,6 +90,7 @@ fun SettingsListItem(
     onLongClickLabel: String? = null,
     overlineContent: @Composable (() -> Unit)? = null,
     supportingContent: String? = null,
+    supportingContentColor: Color = Color.Unspecified,
     leadingContent: @Composable (() -> Unit)? = null,
     trailingContent: @Composable (() -> Unit)? = null,
 ) {
@@ -99,7 +109,14 @@ fun SettingsListItem(
         overlineContent = overlineContent,
         leadingContent = leadingContent,
         trailingContent = trailingContent,
-        supportingContent = supportingContent?.let { { Text(it) } },
+        supportingContent = supportingContent?.let {
+            {
+                Text(
+                    text = it,
+                    color = supportingContentColor
+                )
+            }
+        },
         content = headlineContent
     )
 }
diff --git a/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt
@@ -138,6 +138,23 @@ fun DashboardScreen(
     val showNewDownloaderNotification by vm.newDownloadersAvailable.collectAsStateWithLifecycle(false)
     val managerAutoUpdates by vm.prefs.managerAutoUpdates.getAsState()
     val showManagerUpdateDialogOnLaunch by vm.prefs.showManagerUpdateDialogOnLaunch.getAsState()
+    val disablePatchVersionCompatCheck by vm.prefs.disablePatchVersionCompatCheck.getAsState()
+    val disableSelectionWarning by vm.prefs.disableSelectionWarning.getAsState()
+    val disableUniversalPatchCheck by vm.prefs.disableUniversalPatchCheck.getAsState()
+    val suggestedVersionSafeguard by vm.prefs.suggestedVersionSafeguard.getAsState()
+    val safeguardsToggled by remember(
+        disablePatchVersionCompatCheck,
+        disableSelectionWarning,
+        disableUniversalPatchCheck,
+        suggestedVersionSafeguard
+    ) {
+        derivedStateOf {
+            disablePatchVersionCompatCheck ||
+                disableSelectionWarning ||
+                disableUniversalPatchCheck ||
+                !suggestedVersionSafeguard
+        }
+    }
     val availableUpdate by vm.availableManagerUpdate.collectAsStateWithLifecycle()
     val androidContext = LocalContext.current
     val resources = LocalResources.current
@@ -442,7 +459,18 @@ fun DashboardScreen(
                                 onClick = onSettingsClick,
                                 shapes = IconButtonDefaults.shapes()
                             ) {
-                                Icon(Icons.Filled.Settings, stringResource(R.string.settings))
+                                BadgedBox(
+                                    badge = {
+                                        if (safeguardsToggled) {
+                                            Badge(
+                                                modifier = Modifier.size(6.dp),
+                                                containerColor = MaterialTheme.colorScheme.error
+                                            )
+                                        }
+                                    }
+                                ) {
+                                    Icon(Icons.Filled.Settings, stringResource(R.string.settings))
+                                }
                             }
                         },
                         colors = TopAppBarDefaults.topAppBarColors(
diff --git a/app/src/main/java/app/revanced/manager/ui/screen/SelectedAppInfoScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/SelectedAppInfoScreen.kt
@@ -35,8 +35,8 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
@@ -60,7 +60,6 @@ import app.revanced.manager.util.Options
 import app.revanced.manager.util.PatchSelection
 import app.revanced.manager.util.APK_MIMETYPE
 import app.revanced.manager.util.enabled
-import app.revanced.manager.util.toast
 import app.revanced.manager.util.transparentListItemColors
 import kotlinx.coroutines.launch
 import org.koin.compose.koinInject
@@ -74,7 +73,6 @@ fun SelectedAppInfoScreen(
     onBackClick: () -> Unit,
     vm: SelectedAppInfoViewModel
 ) {
-    val context = LocalContext.current
     val resources = LocalResources.current
     val networkInfo = koinInject<NetworkInfo>()
     val networkConnected = remember { networkInfo.isConnected() }
@@ -102,13 +100,40 @@ fun SelectedAppInfoScreen(
             )
         }
     }
+    val strictVersionOptions by remember(bundles, patches, packageName) {
+        derivedStateOf {
+            buildVersionOptions(
+                bundles = bundles,
+                selectedPatches = patches,
+                packageName = packageName,
+                allowIncompatible = false
+            )
+        }
+    }
     val selectedVersionLabel by remember(vm.selectedApp.version) {
         derivedStateOf {
             vm.selectedApp.version ?: resources.getString(R.string.selected_app_meta_any_version)
         }
     }
     var showVersionSelector by remember { mutableStateOf(false) }
     val selectedPatchCount = patches.values.sumOf { it.size }
+    val hasModifiedPatchSelection by remember(bundles, effectiveAllowIncompatible) {
+        derivedStateOf {
+            vm.hasModifiedPatchSelection(bundles, effectiveAllowIncompatible)
+        }
+    }
+    val showVersionCompatibilityWarning by remember(
+        vm.selectedApp.version,
+        allowIncompatiblePatches,
+        strictVersionOptions
+    ) {
+        derivedStateOf {
+            val selectedVersion = vm.selectedApp.version ?: return@derivedStateOf false
+            allowIncompatiblePatches &&
+                strictVersionOptions.versions.isNotEmpty() &&
+                selectedVersion !in strictVersionOptions.versions
+        }
+    }
 
     LaunchedEffect(versionOptions, vm.selectedApp.version) {
         if (versionOptions.unrestricted) return@LaunchedEffect
@@ -258,6 +283,11 @@ fun SelectedAppInfoScreen(
                     R.string.patch_selector_item_description,
                     selectedPatchCount
                 ),
+                warningDescription = if (hasModifiedPatchSelection) {
+                    stringResource(R.string.patch_selection_changed_warning)
+                } else {
+                    null
+                },
                 onClick = {
                     onPatchSelectorClick(
                         vm.selectedApp,
@@ -272,6 +302,11 @@ fun SelectedAppInfoScreen(
             PageItem(
                 R.string.version,
                 selectedVersionLabel,
+                warningDescription = if (showVersionCompatibilityWarning) {
+                    stringResource(R.string.version_compatibility_warning)
+                } else {
+                    null
+                },
                 enabled = versionOptions.unrestricted || versionOptions.versions.isNotEmpty(),
                 onClick = { showVersionSelector = true }
             )
@@ -355,6 +390,8 @@ private fun PageItem(
     @StringRes title: Int,
     description: String,
     enabled: Boolean = true,
+    warningDescription: String? = null,
+    warningColor: Color = Color.Unspecified,
     onClick: () -> Unit
 ) {
     ListItem(
@@ -370,11 +407,25 @@ private fun PageItem(
             )
         },
         supportingContent = {
-            Text(
-                description,
-                color = MaterialTheme.colorScheme.outline,
-                style = MaterialTheme.typography.bodyMedium
-            )
+            Column(verticalArrangement = Arrangement.spacedBy(2.dp)) {
+                Text(
+                    description,
+                    color = MaterialTheme.colorScheme.outline,
+                    style = MaterialTheme.typography.bodyMedium
+                )
+
+                warningDescription?.let {
+                    Text(
+                        text = "(!) $it",
+                        color = if (warningColor == Color.Unspecified) {
+                            MaterialTheme.colorScheme.tertiary
+                        } else {
+                            warningColor
+                        },
+                        style = MaterialTheme.typography.bodySmall
+                    )
+                }
+            }
         },
         trailingContent = {
             Icon(Icons.AutoMirrored.Outlined.ArrowRight, null)
diff --git a/app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/SettingsScreen.kt
@@ -31,8 +31,10 @@ import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
@@ -62,6 +64,23 @@ private data class Section(
 fun SettingsScreen(onBackClick: () -> Unit, navigate: (Settings.Destination) -> Unit) {
     val prefs: PreferencesManager = koinInject()
     val showDeveloperSettings by prefs.showDeveloperSettings.getAsState()
+    val disablePatchVersionCompatCheck by prefs.disablePatchVersionCompatCheck.getAsState()
+    val disableSelectionWarning by prefs.disableSelectionWarning.getAsState()
+    val disableUniversalPatchCheck by prefs.disableUniversalPatchCheck.getAsState()
+    val suggestedVersionSafeguard by prefs.suggestedVersionSafeguard.getAsState()
+    val safeguardsToggled by remember(
+        disablePatchVersionCompatCheck,
+        disableSelectionWarning,
+        disableUniversalPatchCheck,
+        suggestedVersionSafeguard
+    ) {
+        derivedStateOf {
+            disablePatchVersionCompatCheck ||
+                disableSelectionWarning ||
+                disableUniversalPatchCheck ||
+                !suggestedVersionSafeguard
+        }
+    }
     val scrollState = rememberScrollState()
     val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(
         canScroll = {
@@ -183,9 +202,20 @@ fun SettingsScreen(onBackClick: () -> Unit, navigate: (Settings.Destination) ->
 
                 ListSection {
                     advancedSections.forEach { (name, description, icon, destination) ->
+                        val hasSafeguardWarning = destination == Settings.Advanced && safeguardsToggled
+                        val supportingText = if (hasSafeguardWarning) {
+                            "Safeguards have been toggled"
+                        } else {
+                            stringResource(description)
+                        }
                         SettingsListItem(
                             headlineContent = stringResource(name),
-                            supportingContent = stringResource(description),
+                            supportingContent = supportingText,
+                            supportingContentColor = if (hasSafeguardWarning) {
+                                MaterialTheme.colorScheme.error
+                            } else {
+                                Color.Unspecified
+                            },
                             leadingContent = { ExpressiveListIcon(icon = icon) },
                             onClick = { navigate(destination) }
                         )
diff --git a/app/src/main/java/app/revanced/manager/ui/viewmodel/SelectedAppInfoViewModel.kt b/app/src/main/java/app/revanced/manager/ui/viewmodel/SelectedAppInfoViewModel.kt
@@ -403,6 +403,15 @@ class SelectedAppInfoViewModel(
     fun getPatches(bundles: List<PatchBundleInfo.Scoped>, allowIncompatible: Boolean) =
         selectionState.patches(bundles, allowIncompatible)
 
+    fun hasModifiedPatchSelection(
+        bundles: List<PatchBundleInfo.Scoped>,
+        allowIncompatible: Boolean
+    ): Boolean {
+        val selected = getPatches(bundles, allowIncompatible)
+        val defaults = bundles.toPatchSelection(allowIncompatible) { _, patch -> patch.include }
+        return selected != defaults
+    }
+
     fun getCustomPatches(
         bundles: List<PatchBundleInfo.Scoped>,
         allowIncompatible: Boolean
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -107,6 +107,7 @@ Second \"item\" text"</string>
     <string name="patch_item_description">Start patching the application</string>
     <string name="patch_selector_item">Select patches</string>
     <string name="patch_selector_item_description">%d patches selected</string>
+    <string name="patch_selection_changed_warning">Selection of patches has been changed</string>
     <string name="no_patches_selected">No patches selected</string>
 
     <string name="network_unavailable_warning">Your device is not connected to the internet. Downloading will fail later.</string>
@@ -144,6 +145,7 @@ Second \"item\" text"</string>
     <string name="import_export_description">Keystore, patch options and selection</string>
     <string name="advanced">Advanced</string>
     <string name="advanced_description">API URL, memory limit, debugging</string>
+    <string name="safeguards_toggled_warning">Safeguards have been toggled</string>
     <string name="about">About</string>
     <string name="about_app_name">About %1$s</string>
     <string name="opensource_licenses">Open source licenses</string>
@@ -490,6 +492,7 @@ It is only compatible with the following version(s): %2$s</string>
     <string name="repository">Repository</string>
     <string name="bundle_information_by_author">By %1$s</string>
     <string name="version">Version</string>
+    <string name="version_compatibility_warning">Selected version may be incompatible with selected patches</string>
     <string name="submit_feedback">Submit issue or feedback</string>
     <string name="submit_feedback_description">Help us improve this application</string>
     <string name="developer_options">Developer options</string>
