From 03ec2af92e618102c616efcff49320054e99e4f7 Mon Sep 17 00:00:00 2001 From: FooIbar <118464521+FooIbar@users.noreply.github.com> Date: Wed, 16 Jul 2025 23:16:53 +0800 Subject: [PATCH] Remove redundant `PreferenceHeader` overload --- .../ehviewer/ui/settings/PreferenceWidgets.kt | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/PreferenceWidgets.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/PreferenceWidgets.kt index 178145be1..d4fd81bcb 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/PreferenceWidgets.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/PreferenceWidgets.kt @@ -23,9 +23,7 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.graphics.vector.rememberVectorPainter import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.integerArrayResource import androidx.compose.ui.res.stringArrayResource @@ -59,7 +57,7 @@ object PreferenceTokens { @Composable fun PreferenceHeader( - icon: Painter, + icon: ImageVector, @StringRes title: Int, childRoute: DirectionDestinationSpec, navigator: DestinationsNavigator, @@ -69,25 +67,12 @@ fun PreferenceHeader( verticalAlignment = Alignment.CenterVertically, ) { Spacer(modifier = Modifier.size(PreferenceTokens.PreferenceIconPadding)) - Icon(painter = icon, contentDescription = null, modifier = Modifier.size(PreferenceTokens.PreferenceIconSize), tint = MaterialTheme.colorScheme.primary) + Icon(imageVector = icon, contentDescription = null, modifier = Modifier.size(PreferenceTokens.PreferenceIconSize), tint = MaterialTheme.colorScheme.primary) Spacer(modifier = Modifier.size(PreferenceTokens.PreferenceIconPadding)) Text(text = stringResource(id = title), modifier = Modifier.padding(PreferenceTextPadding), style = MaterialTheme.typography.bodyLarge) } } -@Composable -fun PreferenceHeader( - icon: ImageVector, - @StringRes title: Int, - childRoute: DirectionDestinationSpec, - navigator: DestinationsNavigator, -) = PreferenceHeader( - icon = rememberVectorPainter(image = icon), - title = title, - childRoute = childRoute, - navigator = navigator, -) - @Composable fun Preference(title: String, summary: String? = null, onClick: () -> Unit = {}) { TextPref(title = title, summary = summary, onClick = onClick)