mirror of
https://github.com/ReVanced/revanced-manager.git
synced 2026-01-27 21:11:01 +00:00
refactor: Remove redundant modifier parameter from Tooltip components
This commit is contained in:
@@ -70,7 +70,6 @@ fun AppTopBar(
|
|||||||
navigationIcon = {
|
navigationIcon = {
|
||||||
if (onBackClick != null) {
|
if (onBackClick != null) {
|
||||||
TooltipIconButton(
|
TooltipIconButton(
|
||||||
modifier = Modifier,
|
|
||||||
onClick = onBackClick,
|
onClick = onBackClick,
|
||||||
tooltip = stringResource(R.string.back),
|
tooltip = stringResource(R.string.back),
|
||||||
) {
|
) {
|
||||||
@@ -113,7 +112,6 @@ fun AppTopBar(
|
|||||||
navigationIcon = {
|
navigationIcon = {
|
||||||
if (onBackClick != null) {
|
if (onBackClick != null) {
|
||||||
TooltipIconButton(
|
TooltipIconButton(
|
||||||
modifier = Modifier,
|
|
||||||
onClick = onBackClick,
|
onClick = onBackClick,
|
||||||
tooltip = stringResource(R.string.back),
|
tooltip = stringResource(R.string.back),
|
||||||
) {
|
) {
|
||||||
|
|||||||
@@ -139,7 +139,6 @@ fun NotificationCard(
|
|||||||
}
|
}
|
||||||
if (onDismiss != null) {
|
if (onDismiss != null) {
|
||||||
TooltipIconButton(
|
TooltipIconButton(
|
||||||
modifier = modifier,
|
|
||||||
onClick = onDismiss,
|
onClick = onDismiss,
|
||||||
tooltip = stringResource(R.string.close),
|
tooltip = stringResource(R.string.close),
|
||||||
) {
|
) {
|
||||||
|
|||||||
@@ -49,7 +49,6 @@ fun SearchView(
|
|||||||
placeholder = placeholder,
|
placeholder = placeholder,
|
||||||
leadingIcon = {
|
leadingIcon = {
|
||||||
TooltipIconButton(
|
TooltipIconButton(
|
||||||
modifier = Modifier,
|
|
||||||
tooltip = stringResource(R.string.back),
|
tooltip = stringResource(R.string.back),
|
||||||
onClick = { onActiveChange(false) }
|
onClick = { onActiveChange(false) }
|
||||||
) {
|
) {
|
||||||
|
|||||||
@@ -37,7 +37,6 @@ fun BundleTopBar(
|
|||||||
navigationIcon = {
|
navigationIcon = {
|
||||||
if (onBackClick != null) {
|
if (onBackClick != null) {
|
||||||
TooltipIconButton(
|
TooltipIconButton(
|
||||||
modifier = Modifier,
|
|
||||||
tooltip = stringResource(R.string.back),
|
tooltip = stringResource(R.string.back),
|
||||||
onClick = onBackClick
|
onClick = onBackClick
|
||||||
) {
|
) {
|
||||||
|
|||||||
@@ -43,7 +43,6 @@ fun TooltipFloatingActionButton(
|
|||||||
content: @Composable (() -> Unit)
|
content: @Composable (() -> Unit)
|
||||||
) {
|
) {
|
||||||
TooltipWrap(
|
TooltipWrap(
|
||||||
modifier = modifier,
|
|
||||||
tooltip = tooltip,
|
tooltip = tooltip,
|
||||||
positionProvider = positionProvider,
|
positionProvider = positionProvider,
|
||||||
haptic = haptic,
|
haptic = haptic,
|
||||||
@@ -89,7 +88,6 @@ fun TooltipFloatingActionButton(
|
|||||||
content: @Composable (() -> Unit)
|
content: @Composable (() -> Unit)
|
||||||
) {
|
) {
|
||||||
TooltipWrap(
|
TooltipWrap(
|
||||||
modifier = modifier,
|
|
||||||
tooltip = tooltip,
|
tooltip = tooltip,
|
||||||
positionProvider = positionProvider,
|
positionProvider = positionProvider,
|
||||||
haptic = haptic,
|
haptic = haptic,
|
||||||
|
|||||||
@@ -38,7 +38,6 @@ fun TooltipIconButton(
|
|||||||
content: @Composable (() -> Unit),
|
content: @Composable (() -> Unit),
|
||||||
) {
|
) {
|
||||||
TooltipWrap(
|
TooltipWrap(
|
||||||
modifier = modifier,
|
|
||||||
tooltip = tooltip,
|
tooltip = tooltip,
|
||||||
positionProvider = positionProvider,
|
positionProvider = positionProvider,
|
||||||
haptic = haptic,
|
haptic = haptic,
|
||||||
@@ -80,7 +79,6 @@ fun TooltipIconButton(
|
|||||||
content: @Composable (() -> Unit),
|
content: @Composable (() -> Unit),
|
||||||
) {
|
) {
|
||||||
TooltipWrap(
|
TooltipWrap(
|
||||||
modifier = modifier,
|
|
||||||
tooltip = tooltip,
|
tooltip = tooltip,
|
||||||
positionProvider = positionProvider,
|
positionProvider = positionProvider,
|
||||||
haptic = haptic,
|
haptic = haptic,
|
||||||
|
|||||||
@@ -43,7 +43,6 @@ fun TooltipSmallFloatingActionButton(
|
|||||||
content: @Composable (() -> Unit)
|
content: @Composable (() -> Unit)
|
||||||
) {
|
) {
|
||||||
TooltipWrap(
|
TooltipWrap(
|
||||||
modifier = modifier,
|
|
||||||
tooltip = tooltip,
|
tooltip = tooltip,
|
||||||
positionProvider = positionProvider,
|
positionProvider = positionProvider,
|
||||||
haptic = haptic,
|
haptic = haptic,
|
||||||
@@ -89,7 +88,6 @@ fun TooltipSmallFloatingActionButton(
|
|||||||
content: @Composable (() -> Unit)
|
content: @Composable (() -> Unit)
|
||||||
) {
|
) {
|
||||||
TooltipWrap(
|
TooltipWrap(
|
||||||
modifier = modifier,
|
|
||||||
tooltip = tooltip,
|
tooltip = tooltip,
|
||||||
positionProvider = positionProvider,
|
positionProvider = positionProvider,
|
||||||
haptic = haptic,
|
haptic = haptic,
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ import androidx.compose.ui.window.PopupPositionProvider
|
|||||||
@Composable
|
@Composable
|
||||||
@OptIn(ExperimentalMaterial3Api::class)
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
fun TooltipWrap(
|
fun TooltipWrap(
|
||||||
modifier: Modifier,
|
modifier: Modifier = Modifier,
|
||||||
tooltip: String,
|
tooltip: String,
|
||||||
positionProvider: PopupPositionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
|
positionProvider: PopupPositionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
|
||||||
haptic: Boolean = true,
|
haptic: Boolean = true,
|
||||||
@@ -70,7 +70,7 @@ fun TooltipWrap(
|
|||||||
@Composable
|
@Composable
|
||||||
@OptIn(ExperimentalMaterial3Api::class)
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
fun TooltipWrap(
|
fun TooltipWrap(
|
||||||
modifier: Modifier,
|
modifier: Modifier = Modifier,
|
||||||
@StringRes tooltip: Int,
|
@StringRes tooltip: Int,
|
||||||
positionProvider: PopupPositionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
|
positionProvider: PopupPositionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
|
||||||
haptic: Boolean = true,
|
haptic: Boolean = true,
|
||||||
|
|||||||
@@ -163,7 +163,6 @@ fun AppSelectorScreen(
|
|||||||
onBackClick = onBackClick,
|
onBackClick = onBackClick,
|
||||||
actions = {
|
actions = {
|
||||||
TooltipIconButton(
|
TooltipIconButton(
|
||||||
modifier = Modifier,
|
|
||||||
tooltip = stringResource(R.string.search_patches),
|
tooltip = stringResource(R.string.search_patches),
|
||||||
onClick = { search = true }
|
onClick = { search = true }
|
||||||
) {
|
) {
|
||||||
|
|||||||
@@ -185,7 +185,6 @@ fun DashboardScreen(
|
|||||||
},
|
},
|
||||||
actions = {
|
actions = {
|
||||||
TooltipIconButton(
|
TooltipIconButton(
|
||||||
modifier = Modifier,
|
|
||||||
onClick = {
|
onClick = {
|
||||||
showDeleteConfirmationDialog = true
|
showDeleteConfirmationDialog = true
|
||||||
},
|
},
|
||||||
@@ -197,7 +196,6 @@ fun DashboardScreen(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
TooltipIconButton(
|
TooltipIconButton(
|
||||||
modifier = Modifier,
|
|
||||||
onClick = {
|
onClick = {
|
||||||
vm.selectedSources.forEach { vm.update(it) }
|
vm.selectedSources.forEach { vm.update(it) }
|
||||||
vm.cancelSourceSelection()
|
vm.cancelSourceSelection()
|
||||||
@@ -217,7 +215,6 @@ fun DashboardScreen(
|
|||||||
actions = {
|
actions = {
|
||||||
if (!vm.updatedManagerVersion.isNullOrEmpty()) {
|
if (!vm.updatedManagerVersion.isNullOrEmpty()) {
|
||||||
TooltipIconButton(
|
TooltipIconButton(
|
||||||
modifier = Modifier,
|
|
||||||
onClick = onUpdateClick,
|
onClick = onUpdateClick,
|
||||||
tooltip = stringResource(R.string.update),
|
tooltip = stringResource(R.string.update),
|
||||||
) {
|
) {
|
||||||
@@ -231,7 +228,6 @@ fun DashboardScreen(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
TooltipIconButton(
|
TooltipIconButton(
|
||||||
modifier = Modifier,
|
|
||||||
onClick = onSettingsClick,
|
onClick = onSettingsClick,
|
||||||
tooltip = stringResource(R.string.settings),
|
tooltip = stringResource(R.string.settings),
|
||||||
) {
|
) {
|
||||||
@@ -250,7 +246,6 @@ fun DashboardScreen(
|
|||||||
},
|
},
|
||||||
floatingActionButton = {
|
floatingActionButton = {
|
||||||
TooltipFloatingActionButton(
|
TooltipFloatingActionButton(
|
||||||
modifier = Modifier,
|
|
||||||
tooltip = stringResource(R.string.add),
|
tooltip = stringResource(R.string.add),
|
||||||
onClick = {
|
onClick = {
|
||||||
vm.cancelSourceSelection()
|
vm.cancelSourceSelection()
|
||||||
|
|||||||
@@ -165,7 +165,6 @@ fun PatcherScreen(
|
|||||||
BottomAppBar(
|
BottomAppBar(
|
||||||
actions = {
|
actions = {
|
||||||
TooltipIconButton(
|
TooltipIconButton(
|
||||||
modifier = Modifier,
|
|
||||||
onClick = { exportApkLauncher.launch("${viewModel.packageName}_${viewModel.version}_revanced_patched.apk") },
|
onClick = { exportApkLauncher.launch("${viewModel.packageName}_${viewModel.version}_revanced_patched.apk") },
|
||||||
enabled = patcherSucceeded == true,
|
enabled = patcherSucceeded == true,
|
||||||
tooltip = stringResource(R.string.save_apk),
|
tooltip = stringResource(R.string.save_apk),
|
||||||
@@ -173,7 +172,6 @@ fun PatcherScreen(
|
|||||||
Icon(Icons.Outlined.Save, stringResource(id = R.string.save_apk))
|
Icon(Icons.Outlined.Save, stringResource(id = R.string.save_apk))
|
||||||
}
|
}
|
||||||
TooltipIconButton(
|
TooltipIconButton(
|
||||||
modifier = Modifier,
|
|
||||||
onClick = { viewModel.exportLogs(context) },
|
onClick = { viewModel.exportLogs(context) },
|
||||||
enabled = patcherSucceeded != null,
|
enabled = patcherSucceeded != null,
|
||||||
tooltip = stringResource(R.string.save_logs),
|
tooltip = stringResource(R.string.save_logs),
|
||||||
|
|||||||
@@ -287,7 +287,6 @@ fun PatchesSelectorScreen(
|
|||||||
) { searchExpanded ->
|
) { searchExpanded ->
|
||||||
if (searchExpanded) {
|
if (searchExpanded) {
|
||||||
TooltipIconButton(
|
TooltipIconButton(
|
||||||
modifier = Modifier,
|
|
||||||
onClick = { setQuery("") },
|
onClick = { setQuery("") },
|
||||||
enabled = query.isNotEmpty(),
|
enabled = query.isNotEmpty(),
|
||||||
tooltip = stringResource(R.string.clear),
|
tooltip = stringResource(R.string.clear),
|
||||||
@@ -299,7 +298,6 @@ fun PatchesSelectorScreen(
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
TooltipIconButton(
|
TooltipIconButton(
|
||||||
modifier = Modifier,
|
|
||||||
onClick = { showBottomSheet = true },
|
onClick = { showBottomSheet = true },
|
||||||
tooltip = stringResource(R.string.more),
|
tooltip = stringResource(R.string.more),
|
||||||
) {
|
) {
|
||||||
@@ -365,7 +363,6 @@ fun PatchesSelectorScreen(
|
|||||||
verticalArrangement = Arrangement.spacedBy(4.dp)
|
verticalArrangement = Arrangement.spacedBy(4.dp)
|
||||||
) {
|
) {
|
||||||
TooltipSmallFloatingActionButton(
|
TooltipSmallFloatingActionButton(
|
||||||
modifier = Modifier,
|
|
||||||
tooltip = stringResource(R.string.more),
|
tooltip = stringResource(R.string.more),
|
||||||
onClick = { showBottomSheet = true },
|
onClick = { showBottomSheet = true },
|
||||||
containerColor = MaterialTheme.colorScheme.tertiaryContainer
|
containerColor = MaterialTheme.colorScheme.tertiaryContainer
|
||||||
@@ -376,7 +373,6 @@ fun PatchesSelectorScreen(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
TooltipSmallFloatingActionButton(
|
TooltipSmallFloatingActionButton(
|
||||||
modifier = Modifier,
|
|
||||||
tooltip = stringResource(R.string.reset),
|
tooltip = stringResource(R.string.reset),
|
||||||
onClick = viewModel::reset,
|
onClick = viewModel::reset,
|
||||||
containerColor = MaterialTheme.colorScheme.tertiaryContainer
|
containerColor = MaterialTheme.colorScheme.tertiaryContainer
|
||||||
@@ -565,7 +561,6 @@ fun ListHeader(
|
|||||||
trailingContent = onHelpClick?.let {
|
trailingContent = onHelpClick?.let {
|
||||||
{
|
{
|
||||||
TooltipIconButton(
|
TooltipIconButton(
|
||||||
modifier = Modifier,
|
|
||||||
tooltip = stringResource(R.string.help),
|
tooltip = stringResource(R.string.help),
|
||||||
onClick = it
|
onClick = it
|
||||||
) {
|
) {
|
||||||
@@ -648,7 +643,6 @@ private fun OptionsDialog(
|
|||||||
onBackClick = onDismissRequest,
|
onBackClick = onDismissRequest,
|
||||||
actions = {
|
actions = {
|
||||||
TooltipIconButton(
|
TooltipIconButton(
|
||||||
modifier = Modifier,
|
|
||||||
tooltip = stringResource(R.string.reset),
|
tooltip = stringResource(R.string.reset),
|
||||||
onClick = reset
|
onClick = reset
|
||||||
) {
|
) {
|
||||||
|
|||||||
@@ -85,7 +85,6 @@ fun DownloadsSettingsScreen(
|
|||||||
actions = {
|
actions = {
|
||||||
if (viewModel.appSelection.isNotEmpty()) {
|
if (viewModel.appSelection.isNotEmpty()) {
|
||||||
TooltipIconButton(
|
TooltipIconButton(
|
||||||
modifier = Modifier,
|
|
||||||
tooltip = stringResource(R.string.delete),
|
tooltip = stringResource(R.string.delete),
|
||||||
onClick = { showDeleteConfirmationDialog = true }
|
onClick = { showDeleteConfirmationDialog = true }
|
||||||
) {
|
) {
|
||||||
|
|||||||
Reference in New Issue
Block a user