refactor: Remove redundant modifier parameter from Tooltip components

2026-01-18 08:43:56 +00:00 · 2025-08-27 22:52:29 +07:00
parent 05afc6bd0c
commit 9b53ffd7cf
13 changed files with 2 additions and 28 deletions
--- a/app/src/main/java/app/revanced/manager/ui/component/AppScaffold.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/AppScaffold.kt
@@ -70,7 +70,6 @@ fun AppTopBar(
        navigationIcon = {
            if (onBackClick != null) {
                TooltipIconButton(
-                    modifier = Modifier,
                    onClick = onBackClick,
                    tooltip = stringResource(R.string.back),
                ) {
@@ -113,7 +112,6 @@ fun AppTopBar(
        navigationIcon = {
            if (onBackClick != null) {
                TooltipIconButton(
-                    modifier = Modifier,
                    onClick = onBackClick,
                    tooltip = stringResource(R.string.back),
                ) {
--- a/app/src/main/java/app/revanced/manager/ui/component/NotificationCard.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/NotificationCard.kt
@@ -139,7 +139,6 @@ fun NotificationCard(
            }
            if (onDismiss != null) {
                TooltipIconButton(
-                    modifier = modifier,
                    onClick = onDismiss,
                    tooltip = stringResource(R.string.close),
                ) {
--- a/app/src/main/java/app/revanced/manager/ui/component/SearchView.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/SearchView.kt
@@ -49,7 +49,6 @@ fun SearchView(
                placeholder = placeholder,
                leadingIcon = {
                    TooltipIconButton(
-                        modifier = Modifier,
                        tooltip = stringResource(R.string.back),
                        onClick = { onActiveChange(false) }
                    ) {
--- a/app/src/main/java/app/revanced/manager/ui/component/bundle/BundleTopBar.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/bundle/BundleTopBar.kt
@@ -37,7 +37,6 @@ fun BundleTopBar(
        navigationIcon = {
            if (onBackClick != null) {
                TooltipIconButton(
-                    modifier = Modifier,
                    tooltip = stringResource(R.string.back),
                    onClick = onBackClick
                ) {
--- a/app/src/main/java/app/revanced/manager/ui/component/tooltip/TooltipFloatingActionButton.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/tooltip/TooltipFloatingActionButton.kt
@@ -43,7 +43,6 @@ fun TooltipFloatingActionButton(
    content: @Composable (() -> Unit)
 ) {
    TooltipWrap(
-        modifier = modifier,
        tooltip = tooltip,
        positionProvider = positionProvider,
        haptic = haptic,
@@ -89,7 +88,6 @@ fun TooltipFloatingActionButton(
    content: @Composable (() -> Unit)
 ) {
    TooltipWrap(
-        modifier = modifier,
        tooltip = tooltip,
        positionProvider = positionProvider,
        haptic = haptic,
--- a/app/src/main/java/app/revanced/manager/ui/component/tooltip/TooltipIconButton.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/tooltip/TooltipIconButton.kt
@@ -38,7 +38,6 @@ fun TooltipIconButton(
    content: @Composable (() -> Unit),
 ) {
    TooltipWrap(
-        modifier = modifier,
        tooltip = tooltip,
        positionProvider = positionProvider,
        haptic = haptic,
@@ -80,7 +79,6 @@ fun TooltipIconButton(
    content: @Composable (() -> Unit),
 ) {
    TooltipWrap(
-        modifier = modifier,
        tooltip = tooltip,
        positionProvider = positionProvider,
        haptic = haptic,
--- a/app/src/main/java/app/revanced/manager/ui/component/tooltip/TooltipSmallFloatingActionButton.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/tooltip/TooltipSmallFloatingActionButton.kt
@@ -43,7 +43,6 @@ fun TooltipSmallFloatingActionButton(
    content: @Composable (() -> Unit)
 ) {
    TooltipWrap(
-        modifier = modifier,
        tooltip = tooltip,
        positionProvider = positionProvider,
        haptic = haptic,
@@ -89,7 +88,6 @@ fun TooltipSmallFloatingActionButton(
    content: @Composable (() -> Unit)
 ) {
    TooltipWrap(
-        modifier = modifier,
        tooltip = tooltip,
        positionProvider = positionProvider,
        haptic = haptic,
--- a/app/src/main/java/app/revanced/manager/ui/component/tooltip/TooltipWrap.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/tooltip/TooltipWrap.kt
@@ -30,7 +30,7 @@ import androidx.compose.ui.window.PopupPositionProvider
@Composable
@OptIn(ExperimentalMaterial3Api::class)
 fun TooltipWrap(
-    modifier: Modifier,
+    modifier: Modifier = Modifier,
    tooltip: String,
    positionProvider: PopupPositionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
    haptic: Boolean = true,
@@ -70,7 +70,7 @@ fun TooltipWrap(
@Composable
@OptIn(ExperimentalMaterial3Api::class)
 fun TooltipWrap(
-    modifier: Modifier,
+    modifier: Modifier = Modifier,
    @StringRes tooltip: Int,
    positionProvider: PopupPositionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
    haptic: Boolean = true,
--- a/app/src/main/java/app/revanced/manager/ui/screen/AppSelectorScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/AppSelectorScreen.kt
@@ -163,7 +163,6 @@ fun AppSelectorScreen(
                onBackClick = onBackClick,
                actions = {
                    TooltipIconButton(
-                        modifier = Modifier,
                        tooltip = stringResource(R.string.search_patches),
                        onClick = { search = true }
                    ) {
--- a/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt
@@ -185,7 +185,6 @@ fun DashboardScreen(
                    },
                    actions = {
                        TooltipIconButton(
-                            modifier = Modifier,
                            onClick = {
                                showDeleteConfirmationDialog = true
                            },
@@ -197,7 +196,6 @@ fun DashboardScreen(
                            )
                        }
                        TooltipIconButton(
-                            modifier = Modifier,
                            onClick = {
                                vm.selectedSources.forEach { vm.update(it) }
                                vm.cancelSourceSelection()
@@ -217,7 +215,6 @@ fun DashboardScreen(
                    actions = {
                        if (!vm.updatedManagerVersion.isNullOrEmpty()) {
                            TooltipIconButton(
-                                modifier = Modifier,
                                onClick = onUpdateClick,
                                tooltip = stringResource(R.string.update),
                            ) {
@@ -231,7 +228,6 @@ fun DashboardScreen(
                            }
                        }
                        TooltipIconButton(
-                            modifier = Modifier,
                            onClick = onSettingsClick,
                            tooltip = stringResource(R.string.settings),
                        ) {
@@ -250,7 +246,6 @@ fun DashboardScreen(
        },
        floatingActionButton = {
            TooltipFloatingActionButton(
-                modifier = Modifier,
                tooltip = stringResource(R.string.add),
                onClick = {
                    vm.cancelSourceSelection()
--- a/app/src/main/java/app/revanced/manager/ui/screen/PatcherScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/PatcherScreen.kt
@@ -165,7 +165,6 @@ fun PatcherScreen(
            BottomAppBar(
                actions = {
                    TooltipIconButton(
-                        modifier = Modifier,
                        onClick = { exportApkLauncher.launch("${viewModel.packageName}_${viewModel.version}_revanced_patched.apk") },
                        enabled = patcherSucceeded == true,
                        tooltip = stringResource(R.string.save_apk),
@@ -173,7 +172,6 @@ fun PatcherScreen(
                        Icon(Icons.Outlined.Save, stringResource(id = R.string.save_apk))
                    }
                    TooltipIconButton(
-                        modifier = Modifier,
                        onClick = { viewModel.exportLogs(context) },
                        enabled = patcherSucceeded != null,
                        tooltip = stringResource(R.string.save_logs),
--- a/app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt
@@ -287,7 +287,6 @@ fun PatchesSelectorScreen(
                    ) { searchExpanded ->
                        if (searchExpanded) {
                            TooltipIconButton(
-                                modifier = Modifier,
                                onClick = { setQuery("") },
                                enabled = query.isNotEmpty(),
                                tooltip = stringResource(R.string.clear),
@@ -299,7 +298,6 @@ fun PatchesSelectorScreen(
                            }
                        } else {
                            TooltipIconButton(
-                                modifier = Modifier,
                                onClick = { showBottomSheet = true },
                                tooltip = stringResource(R.string.more),
                            ) {
@@ -365,7 +363,6 @@ fun PatchesSelectorScreen(
                    verticalArrangement = Arrangement.spacedBy(4.dp)
                ) {
                    TooltipSmallFloatingActionButton(
-                        modifier = Modifier,
                        tooltip = stringResource(R.string.more),
                        onClick = { showBottomSheet = true },
                        containerColor = MaterialTheme.colorScheme.tertiaryContainer
@@ -376,7 +373,6 @@ fun PatchesSelectorScreen(
                        )
                    }
                    TooltipSmallFloatingActionButton(
-                        modifier = Modifier,
                        tooltip = stringResource(R.string.reset),
                        onClick = viewModel::reset,
                        containerColor = MaterialTheme.colorScheme.tertiaryContainer
@@ -565,7 +561,6 @@ fun ListHeader(
        trailingContent = onHelpClick?.let {
            {
                TooltipIconButton(
-                    modifier = Modifier,
                    tooltip = stringResource(R.string.help),
                    onClick = it
                ) {
@@ -648,7 +643,6 @@ private fun OptionsDialog(
                onBackClick = onDismissRequest,
                actions = {
                    TooltipIconButton(
-                        modifier = Modifier,
                        tooltip = stringResource(R.string.reset),
                        onClick = reset
                    ) {
--- 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
@@ -85,7 +85,6 @@ fun DownloadsSettingsScreen(
                actions = {
                    if (viewModel.appSelection.isNotEmpty()) {
                        TooltipIconButton(
-                            modifier = Modifier,
                            tooltip = stringResource(R.string.delete),
                            onClick = { showDeleteConfirmationDialog = true }
                        ) {