chore: Merge branch 'compose-dev' into feat/tooltip

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

@@ -69,10 +69,15 @@ fun AppTopBar(
         scrollBehavior = scrollBehavior,
         navigationIcon = {
             if (onBackClick != null) {
+                TooltipWrap(
+                    modifier = Modifier,
+                    tooltip = stringResource(R.string.back),
+                ) {
                     IconButton(onClick = onBackClick) {
                         backIcon()
                     }
                 }
+            }
         },
         actions = actions,
         colors = TopAppBarDefaults.topAppBarColors(
@@ -108,10 +113,15 @@ fun AppTopBar(
         scrollBehavior = scrollBehavior,
         navigationIcon = {
             if (onBackClick != null) {
+                TooltipWrap(
+                    modifier = Modifier,
+                    tooltip = stringResource(R.string.back),
+                ) {
                     IconButton(onClick = onBackClick) {
                         backIcon()
                     }
                 }
+            }
         },
         actions = actions,
         colors = TopAppBarDefaults.topAppBarColors(

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

@@ -27,6 +27,10 @@ fun ArrowButton(
     )
 
     onClick?.let {
+        TooltipWrap(
+            modifier = Modifier,
+            tooltip = stringResource(description),
+        ) {
             IconButton(onClick = it) {
                 Icon(
                     imageVector = Icons.Filled.KeyboardArrowUp,
@@ -36,6 +40,7 @@ fun ArrowButton(
                         .then(modifier)
                 )
             }
+        }
     } ?: Icon(
         imageVector = Icons.Filled.KeyboardArrowUp,
         contentDescription = stringResource(description),

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

@@ -39,6 +39,10 @@ fun ExceptionViewerDialog(text: String, onDismiss: () -> Unit) {
                         )
                     },
                     actions = {
+                        TooltipWrap(
+                            modifier = Modifier,
+                            tooltip = stringResource(R.string.share),
+                        ) {
                             IconButton(
                                 onClick = {
                                     val sendIntent: Intent = Intent().apply {
@@ -60,6 +64,7 @@ fun ExceptionViewerDialog(text: String, onDismiss: () -> Unit) {
                                 )
                             }
                         }
+                    }
                 )
             }
         ) { paddingValues ->

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

@@ -138,6 +138,10 @@ fun NotificationCard(
                 )
             }
             if (onDismiss != null) {
+                TooltipWrap(
+                    modifier = modifier,
+                    tooltip = stringResource(R.string.close),
+                ) {
                     IconButton(onClick = onDismiss) {
                         Icon(
                             imageVector = Icons.Outlined.Close,
@@ -149,6 +153,7 @@ fun NotificationCard(
             }
         }
     }
+}
 
 @Composable
 private fun NotificationCardInstance(

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

@@ -33,6 +33,10 @@ fun PasswordField(modifier: Modifier = Modifier, value: String, onValueChange: (
         label = label,
         modifier = modifier,
         trailingIcon = {
+            TooltipWrap(
+                modifier = modifier,
+                tooltip = if (visible) stringResource(R.string.show_password_field) else stringResource(R.string.hide_password_field),
+            ) {
                 IconButton(onClick = {
                     visible = !visible
                 }) {
@@ -41,6 +45,7 @@ fun PasswordField(modifier: Modifier = Modifier, value: String, onValueChange: (
                     }
                     Icon(icon, stringResource(description))
                 }
+            }
         },
         keyboardOptions = KeyboardOptions(
             keyboardType = KeyboardType.Password

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

@@ -48,6 +48,10 @@ fun SearchView(
                 onExpandedChange = onActiveChange,
                 placeholder = placeholder,
                 leadingIcon = {
+                    TooltipWrap(
+                        modifier = Modifier,
+                        tooltip = stringResource(R.string.back),
+                    ) {
                         IconButton(onClick = { onActiveChange(false) }) {
                             Icon(
                                 Icons.AutoMirrored.Filled.ArrowBack,
@@ -55,6 +59,7 @@ fun SearchView(
                             )
                         }
                     }
+                }
             )
         },
         expanded = true,

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

@@ -0,0 +1,94 @@
+package app.revanced.manager.ui.component
+
+import androidx.annotation.StringRes
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.PlainTooltip
+import androidx.compose.material3.Text
+import androidx.compose.material3.TooltipBox
+import androidx.compose.material3.TooltipDefaults
+import androidx.compose.material3.rememberTooltipState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.hapticfeedback.HapticFeedbackType
+import androidx.compose.ui.platform.LocalHapticFeedback
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.window.PopupPositionProvider
+
+/**
+ * Wraps a composable with a tooltip.
+ *
+ * @param modifier the [Modifier] to be applied to the [TooltipBox]
+ * @param tooltip the text to be displayed in the [TooltipBox]
+ * @param positionProvider Anchor point for the tooltip, defaults to [TooltipDefaults.rememberPlainTooltipPositionProvider]
+ * @param content The composable UI to be wrapped with [TooltipBox]
+ *
+ * @see [TooltipBox]
+ */
+@Composable
+@OptIn(ExperimentalMaterial3Api::class)
+fun TooltipWrap(
+    modifier: Modifier,
+    tooltip: String,
+    positionProvider: PopupPositionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
+    content: @Composable () -> Unit
+) {
+    val tooltipState = rememberTooltipState()
+    val haptic = LocalHapticFeedback.current
+
+    LaunchedEffect(tooltipState.isVisible) {
+        if (tooltipState.isVisible) {
+            haptic.performHapticFeedback(HapticFeedbackType.LongPress)
+        }
+    }
+
+    TooltipBox(
+        modifier = modifier,
+        positionProvider = positionProvider,
+        tooltip = {
+            PlainTooltip { Text(tooltip) }
+        },
+        state = tooltipState
+    ) {
+        content()
+    }
+}
+
+/**
+ * Wraps a composable with a tooltip.
+ *
+ * @param modifier the [Modifier] to be applied to the [TooltipBox]
+ * @param tooltip the R.string to be displayed in the [TooltipBox]
+ * @param positionProvider Anchor point for the tooltip, defaults to [TooltipDefaults.rememberPlainTooltipPositionProvider]
+ * @param content The composable UI to be wrapped with [TooltipBox]
+ *
+ * @see [TooltipBox]
+ */
+@Composable
+@OptIn(ExperimentalMaterial3Api::class)
+fun TooltipWrap(
+    modifier: Modifier,
+    @StringRes tooltip: Int,
+    positionProvider: PopupPositionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
+    content: @Composable () -> Unit
+) {
+    val tooltipState = rememberTooltipState()
+    val haptic = LocalHapticFeedback.current
+
+    LaunchedEffect(tooltipState.isVisible) {
+        if (tooltipState.isVisible) {
+            haptic.performHapticFeedback(HapticFeedbackType.LongPress)
+        }
+    }
+
+    TooltipBox(
+        modifier = modifier,
+        positionProvider = positionProvider,
+        tooltip = {
+            PlainTooltip { Text(stringResource(tooltip)) }
+        },
+        state = tooltipState
+    ) {
+        content()
+    }
+}

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

@@ -22,6 +22,7 @@ import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.isDefaul
 import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.nameState
 import app.revanced.manager.ui.component.ExceptionViewerDialog
 import app.revanced.manager.ui.component.FullscreenDialog
+import app.revanced.manager.ui.component.TooltipWrap
 import kotlinx.coroutines.launch
 import org.koin.compose.koinInject
 
@@ -73,6 +74,10 @@ fun BundleInformationDialog(
                     },
                     actions = {
                         if (!bundle.isDefault) {
+                            TooltipWrap(
+                                modifier = Modifier,
+                                tooltip = stringResource(R.string.delete),
+                            ) {
                                 IconButton(onClick = onDeleteRequest) {
                                     Icon(
                                         Icons.Outlined.DeleteOutline,
@@ -80,7 +85,12 @@ fun BundleInformationDialog(
                                     )
                                 }
                             }
+                        }
                         if (!isLocal && hasNetwork) {
+                            TooltipWrap(
+                                modifier = Modifier,
+                                tooltip = stringResource(R.string.refresh),
+                            ) {
                                 IconButton(onClick = onUpdate) {
                                     Icon(
                                         Icons.Outlined.Update,
@@ -89,6 +99,7 @@ fun BundleInformationDialog(
                                 }
                             }
                         }
+                    }
                 )
             },
         ) { paddingValues ->

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

@@ -10,7 +10,11 @@ import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import app.revanced.manager.R
+import app.revanced.manager.ui.component.TooltipWrap
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -33,10 +37,15 @@ fun BundleTopBar(
         scrollBehavior = scrollBehavior,
         navigationIcon = {
             if (onBackClick != null) {
+                TooltipWrap(
+                    modifier = Modifier,
+                    tooltip = stringResource(R.string.back),
+                ) {
                     IconButton(onClick = onBackClick) {
                         backIcon()
                     }
                 }
+            }
         },
         actions = actions,
         colors = TopAppBarDefaults.topAppBarColors(

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

@@ -189,6 +189,7 @@ fun ImportBundleStep(
                         },
                         supportingContent = { Text(stringResource(if (patchBundle != null) R.string.file_field_set else R.string.file_field_not_set)) },
                         trailingContent = {
+                            // TODO: Determine if this button should be [TooltipWrap]'ped
                             IconButton(onClick = launchPatchActivity) {
                                 Icon(imageVector = Icons.Default.Topic, contentDescription = null)
                             }

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

@@ -65,6 +65,7 @@ import app.revanced.manager.ui.component.FloatInputDialog
 import app.revanced.manager.ui.component.FullscreenDialog
 import app.revanced.manager.ui.component.IntInputDialog
 import app.revanced.manager.ui.component.LongInputDialog
+import app.revanced.manager.ui.component.TooltipWrap
 import app.revanced.manager.ui.component.haptics.HapticExtendedFloatingActionButton
 import app.revanced.manager.ui.component.haptics.HapticRadioButton
 import app.revanced.manager.ui.component.haptics.HapticSwitch
@@ -74,13 +75,11 @@ import app.revanced.manager.util.saver.snapshotStateListSaver
 import app.revanced.manager.util.saver.snapshotStateSetSaver
 import app.revanced.manager.util.toast
 import app.revanced.manager.util.transparentListItemColors
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.parcelize.Parcelize
 import org.koin.compose.koinInject
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.get
 import sh.calvin.reorderable.ReorderableItem
-import sh.calvin.reorderable.rememberReorderableLazyColumnState
 import sh.calvin.reorderable.rememberReorderableLazyListState
 import java.io.Serializable
 import kotlin.random.Random
@@ -113,10 +112,15 @@ private interface OptionEditor<T : Any> {
 
     @Composable
     fun ListItemTrailingContent(scope: OptionEditorScope<T>) {
+        TooltipWrap(
+            modifier = Modifier,
+            tooltip = stringResource(R.string.edit),
+        ) {
             IconButton(onClick = { clickAction(scope) }) {
                 Icon(Icons.Outlined.Edit, stringResource(R.string.edit))
             }
         }
+    }
 
     @Composable
     fun Dialog(scope: OptionEditorScope<T>)
@@ -249,6 +253,10 @@ private object StringOptionEditor : OptionEditor<String> {
                     },
                     trailingIcon = {
                         var showDropdownMenu by rememberSaveable { mutableStateOf(false) }
+                        TooltipWrap(
+                            modifier = Modifier,
+                            tooltip = stringResource(R.string.string_option_menu_description),
+                        ) {
                             IconButton(
                                 onClick = { showDropdownMenu = true }
                             ) {
@@ -257,6 +265,7 @@ private object StringOptionEditor : OptionEditor<String> {
                                     stringResource(R.string.string_option_menu_description)
                                 )
                             }
+                        }
 
                         DropdownMenu(
                             expanded = showDropdownMenu,
@@ -551,6 +560,10 @@ private class ListOptionEditor<T : Serializable>(private val elementEditor: Opti
                         },
                         actions = {
                             if (deleteMode) {
+                                TooltipWrap(
+                                    modifier = Modifier,
+                                    tooltip = stringResource(R.string.select_deselect_all),
+                                ) {
                                     IconButton(
                                         onClick = {
                                             if (items.size == deletionTargets.size) deletionTargets.clear()
@@ -562,6 +575,11 @@ private class ListOptionEditor<T : Serializable>(private val elementEditor: Opti
                                             stringResource(R.string.select_deselect_all)
                                         )
                                     }
+                                }
+                                TooltipWrap(
+                                    modifier = Modifier,
+                                    tooltip = stringResource(R.string.delete),
+                                ) {
                                     IconButton(
                                         onClick = {
                                             items.removeIf { it.key in deletionTargets }
@@ -574,12 +592,18 @@ private class ListOptionEditor<T : Serializable>(private val elementEditor: Opti
                                             stringResource(R.string.delete)
                                         )
                                     }
+                                }
                             } else {
+                                TooltipWrap(
+                                    modifier = Modifier,
+                                    tooltip = stringResource(R.string.reset),
+                                ) {
                                     IconButton(onClick = items::clear) {
                                         Icon(Icons.Outlined.Restore, stringResource(R.string.reset))
                                     }
                                 }
                             }
+                        }
                     )
                 },
                 floatingActionButton = {
@@ -643,6 +667,10 @@ private class ListOptionEditor<T : Serializable>(private val elementEditor: Opti
                                     ),
                                     tonalElevation = if (deleteMode && item.key in deletionTargets) 8.dp else 0.dp,
                                     leadingContent = {
+                                        TooltipWrap(
+                                            modifier = Modifier,
+                                            tooltip = stringResource(R.string.drag_handle),
+                                        ) {
                                             IconButton(
                                                 modifier = Modifier.draggableHandle(interactionSource = interactionSource),
                                                 onClick = {},
@@ -652,6 +680,7 @@ private class ListOptionEditor<T : Serializable>(private val elementEditor: Opti
                                                     stringResource(R.string.drag_handle)
                                                 )
                                             }
+                                        }
                                     },
                                     headlineContent = {
                                         if (item.value == null) return@ListItem Text(

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

@@ -17,6 +17,7 @@ import androidx.compose.ui.res.stringResource
 import app.revanced.manager.R
 import app.revanced.manager.domain.manager.base.Preference
 import app.revanced.manager.ui.component.IntInputDialog
+import app.revanced.manager.ui.component.TooltipWrap
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 
@@ -65,6 +66,10 @@ fun IntegerItem(
         headlineContent = stringResource(headline),
         supportingContent = stringResource(description),
         trailingContent = {
+            TooltipWrap(
+                modifier = Modifier,
+                tooltip = stringResource(R.string.edit),
+            ) {
                 IconButton(onClick = { dialogOpen = true }) {
                     Icon(
                         Icons.Outlined.Edit,
@@ -72,5 +77,6 @@ fun IntegerItem(
                     )
                 }
             }
+        }
     )
 }

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

@@ -44,6 +44,7 @@ import app.revanced.manager.ui.component.LazyColumnWithScrollbar
 import app.revanced.manager.ui.component.LoadingIndicator
 import app.revanced.manager.ui.component.NonSuggestedVersionDialog
 import app.revanced.manager.ui.component.SearchView
+import app.revanced.manager.ui.component.TooltipWrap
 import app.revanced.manager.ui.model.SelectedApp
 import app.revanced.manager.ui.viewmodel.AppSelectorViewModel
 import app.revanced.manager.util.APK_MIMETYPE
@@ -162,10 +163,15 @@ fun AppSelectorScreen(
                 scrollBehavior = scrollBehavior,
                 onBackClick = onBackClick,
                 actions = {
+                    TooltipWrap(
+                        modifier = Modifier,
+                        tooltip = stringResource(R.string.search_patches),
+                    ) {
                         IconButton(onClick = { search = true }) {
                             Icon(Icons.Outlined.Search, stringResource(R.string.search))
                         }
                     }
+                }
             )
         },
         modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),

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

@@ -62,8 +62,9 @@ import app.revanced.manager.ui.component.AlertDialogExtended
 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.NotificationCard
+import app.revanced.manager.ui.component.TooltipWrap
 import app.revanced.manager.ui.component.bundle.BundleTopBar
 import app.revanced.manager.ui.component.bundle.ImportPatchBundleDialog
 import app.revanced.manager.ui.component.haptics.HapticFloatingActionButton
@@ -183,6 +184,10 @@ fun DashboardScreen(
                         )
                     },
                     actions = {
+                        TooltipWrap(
+                            modifier = Modifier,
+                            tooltip = stringResource(R.string.delete),
+                        ) {
                             IconButton(
                                 onClick = {
                                     showDeleteConfirmationDialog = true
@@ -193,6 +198,11 @@ fun DashboardScreen(
                                     stringResource(R.string.delete)
                                 )
                             }
+                        }
+                        TooltipWrap(
+                            modifier = Modifier,
+                            tooltip = stringResource(R.string.refresh),
+                        ) {
                             IconButton(
                                 onClick = {
                                     vm.selectedSources.forEach { vm.update(it) }
@@ -205,12 +215,17 @@ fun DashboardScreen(
                                 )
                             }
                         }
+                    }
                 )
             } else {
                 AppTopBar(
                     title = stringResource(R.string.app_name),
                     actions = {
                         if (!vm.updatedManagerVersion.isNullOrEmpty()) {
+                            TooltipWrap(
+                                modifier = Modifier,
+                                tooltip = stringResource(R.string.update),
+                            ) {
                                 IconButton(
                                     onClick = onUpdateClick,
                                 ) {
@@ -223,15 +238,25 @@ fun DashboardScreen(
                                     }
                                 }
                             }
+                        }
+                        TooltipWrap(
+                            modifier = Modifier,
+                            tooltip = stringResource(R.string.settings),
+                        ) {
                             IconButton(onClick = onSettingsClick) {
                                 Icon(Icons.Outlined.Settings, stringResource(R.string.settings))
                             }
+                        }
                     },
                     applyContainerColor = true
                 )
             }
         },
         floatingActionButton = {
+            TooltipWrap(
+                modifier = Modifier,
+                tooltip = stringResource(R.string.add),
+            ) {
                 HapticFloatingActionButton(
                     onClick = {
                         vm.cancelSourceSelection()
@@ -262,6 +287,7 @@ fun DashboardScreen(
                     }
                 ) { Icon(Icons.Default.Add, stringResource(R.string.add)) }
             }
+        }
     ) { paddingValues ->
         Column(Modifier.padding(paddingValues)) {
             TabRow(

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

@@ -48,6 +48,7 @@ import app.revanced.manager.ui.component.AppScaffold
 import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.ConfirmDialog
 import app.revanced.manager.ui.component.InstallerStatusDialog
+import app.revanced.manager.ui.component.TooltipWrap
 import app.revanced.manager.ui.component.haptics.HapticExtendedFloatingActionButton
 import app.revanced.manager.ui.component.patcher.InstallPickerDialog
 import app.revanced.manager.ui.component.patcher.Steps
@@ -164,18 +165,28 @@ fun PatcherScreen(
         bottomBar = {
             BottomAppBar(
                 actions = {
+                    TooltipWrap(
+                        modifier = Modifier,
+                        tooltip = stringResource(R.string.save_apk),
+                    ) {
                         IconButton(
                             onClick = { exportApkLauncher.launch("${viewModel.packageName}_${viewModel.version}_revanced_patched.apk") },
                             enabled = patcherSucceeded == true
                         ) {
                             Icon(Icons.Outlined.Save, stringResource(id = R.string.save_apk))
                         }
+                    }
+                    TooltipWrap(
+                        modifier = Modifier,
+                        tooltip = stringResource(R.string.save_logs),
+                    ) {
                         IconButton(
                             onClick = { viewModel.exportLogs(context) },
                             enabled = patcherSucceeded != null
                         ) {
                             Icon(Icons.Outlined.PostAdd, stringResource(id = R.string.save_logs))
                         }
+                    }
                 },
                 floatingActionButton = {
                     AnimatedVisibility(visible = canInstall) {

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

@@ -69,6 +69,7 @@ import app.revanced.manager.ui.component.FullscreenDialog
 import app.revanced.manager.ui.component.LazyColumnWithScrollbar
 import app.revanced.manager.ui.component.SafeguardDialog
 import app.revanced.manager.ui.component.SearchBar
+import app.revanced.manager.ui.component.TooltipWrap
 import app.revanced.manager.ui.component.haptics.HapticCheckbox
 import app.revanced.manager.ui.component.haptics.HapticExtendedFloatingActionButton
 import app.revanced.manager.ui.component.haptics.HapticTab
@@ -259,6 +260,10 @@ fun PatchesSelectorScreen(
                         animationSpec = tween(durationMillis = 400, easing = EaseInOut),
                         label = "SearchBar back button"
                     )
+                    TooltipWrap(
+                        modifier = Modifier,
+                        tooltip = stringResource(R.string.back),
+                    ) {
                         IconButton(
                             onClick = {
                                 if (searchExpanded) {
@@ -274,6 +279,7 @@ fun PatchesSelectorScreen(
                                 contentDescription = stringResource(R.string.back)
                             )
                         }
+                    }
                 },
                 trailingIcon = {
                     AnimatedContent(
@@ -282,6 +288,10 @@ fun PatchesSelectorScreen(
                         transitionSpec = { fadeIn() togetherWith fadeOut() }
                     ) { searchExpanded ->
                         if (searchExpanded) {
+                            TooltipWrap(
+                                modifier = Modifier,
+                                tooltip = stringResource(R.string.clear),
+                            ) {
                                 IconButton(
                                     onClick = { setQuery("") },
                                     enabled = query.isNotEmpty()
@@ -291,7 +301,12 @@ fun PatchesSelectorScreen(
                                         contentDescription = stringResource(R.string.clear)
                                     )
                                 }
+                            }
                         } else {
+                            TooltipWrap(
+                                modifier = Modifier,
+                                tooltip = stringResource(R.string.more),
+                            ) {
                                 IconButton(onClick = { showBottomSheet = true }) {
                                     Icon(
                                         imageVector = Icons.Outlined.FilterList,
@@ -301,6 +316,7 @@ fun PatchesSelectorScreen(
                             }
                         }
                     }
+                }
             ) {
                 val bundle = bundles[pagerState.currentPage]
 
@@ -353,6 +369,10 @@ fun PatchesSelectorScreen(
                 Column(
                     horizontalAlignment = Alignment.End,
                     verticalArrangement = Arrangement.spacedBy(4.dp)
+                ) {
+                    TooltipWrap(
+                        modifier = Modifier,
+                        tooltip = stringResource(R.string.reset),
                     ) {
                         SmallFloatingActionButton(
                             onClick = viewModel::reset,
@@ -360,6 +380,7 @@ fun PatchesSelectorScreen(
                         ) {
                             Icon(Icons.Outlined.Restore, stringResource(R.string.reset))
                         }
+                    }
                     HapticExtendedFloatingActionButton(
                         text = {
                             Text(
@@ -517,6 +538,7 @@ private fun PatchItem(
     supportingContent = patch.description?.let { { Text(it) } },
     trailingContent = {
         if (patch.options?.isNotEmpty() == true) {
+            // TODO: Determine if this button should be [TooltipWrap]
             IconButton(onClick = onOptionsDialog, enabled = compatible) {
                 Icon(Icons.Outlined.Settings, null)
             }
@@ -540,6 +562,10 @@ fun ListHeader(
         },
         trailingContent = onHelpClick?.let {
             {
+                TooltipWrap(
+                    modifier = Modifier,
+                    tooltip = stringResource(R.string.help),
+                ) {
                     IconButton(onClick = it) {
                         Icon(
                             Icons.AutoMirrored.Outlined.HelpOutline,
@@ -547,6 +573,7 @@ fun ListHeader(
                         )
                     }
                 }
+            }
         },
         colors = transparentListItemColors
     )
@@ -619,10 +646,15 @@ private fun OptionsDialog(
                 title = patch.name,
                 onBackClick = onDismissRequest,
                 actions = {
+                    TooltipWrap(
+                        modifier = Modifier,
+                        tooltip = stringResource(R.string.reset),
+                    ) {
                         IconButton(onClick = reset) {
                             Icon(Icons.Outlined.Restore, stringResource(R.string.reset))
                         }
                     }
+                }
             )
         }
     ) { paddingValues ->

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

@@ -49,6 +49,7 @@ import app.revanced.manager.R
 import app.revanced.manager.network.dto.ReVancedSocial
 import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.ColumnWithScrollbar
+import app.revanced.manager.ui.component.TooltipWrap
 import app.revanced.manager.ui.component.settings.SettingsListItem
 import app.revanced.manager.ui.model.navigation.Settings
 import app.revanced.manager.ui.viewmodel.AboutViewModel
@@ -252,6 +253,10 @@ fun AboutSettingsScreen(
                 horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterHorizontally)
             ) {
                 socialButtons.forEach { (icon, text, onClick) ->
+                    TooltipWrap(
+                        modifier = Modifier,
+                        tooltip = text,
+                    ) {
                         IconButton(
                             onClick = onClick,
                             modifier = Modifier.padding(end = 8.dp),
@@ -265,6 +270,7 @@ fun AboutSettingsScreen(
                         }
                     }
                 }
+            }
             OutlinedCard(
                 modifier = Modifier.padding(horizontal = 16.dp),
                 border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant)

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

@@ -48,6 +48,7 @@ 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.TooltipWrap
 import app.revanced.manager.ui.component.settings.BooleanItem
 import app.revanced.manager.ui.component.settings.IntegerItem
 import app.revanced.manager.ui.component.settings.SafeguardBooleanItem
@@ -243,10 +244,15 @@ private fun APIUrlDialog(currentUrl: String, defaultUrl: String, onSubmit: (Stri
                     onValueChange = { url = it },
                     label = { Text(stringResource(R.string.api_url)) },
                     trailingIcon = {
+                        TooltipWrap(
+                            modifier = Modifier,
+                            tooltip = stringResource(R.string.api_url_dialog_reset),
+                        ) {
                             IconButton(onClick = { url = defaultUrl }) {
                                 Icon(Icons.Outlined.Restore, stringResource(R.string.api_url_dialog_reset))
                             }
                         }
+                    }
                 )
             }
         }

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

@@ -45,6 +45,7 @@ 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.TooltipWrap
 import app.revanced.manager.ui.component.haptics.HapticCheckbox
 import app.revanced.manager.ui.component.settings.SettingsListItem
 import app.revanced.manager.ui.viewmodel.DownloadsViewModel
@@ -81,11 +82,16 @@ fun DownloadsSettingsScreen(
                 onBackClick = onBackClick,
                 actions = {
                     if (viewModel.appSelection.isNotEmpty()) {
+                        TooltipWrap(
+                            modifier = Modifier,
+                            tooltip = stringResource(R.string.delete),
+                        ) {
                             IconButton(onClick = { showDeleteConfirmationDialog = true }) {
                                 Icon(Icons.Default.Delete, stringResource(R.string.delete))
                             }
                         }
                     }
+                }
             )
         },
         modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),