From 563f6810be2aa44e75e1af721cb573c8e1f664ca Mon Sep 17 00:00:00 2001 From: tarsin Date: Tue, 6 Jun 2023 00:39:14 +0800 Subject: [PATCH] [DO NOT USE] Merge object PreferenceTokens --- .../com/hippo/ehviewer/ui/settings/PreferenceTokens.kt | 10 ---------- .../hippo/ehviewer/ui/settings/PreferenceWidgets.kt | 8 ++++++++ 2 files changed, 8 insertions(+), 10 deletions(-) delete mode 100644 app/src/main/java/com/hippo/ehviewer/ui/settings/PreferenceTokens.kt diff --git a/app/src/main/java/com/hippo/ehviewer/ui/settings/PreferenceTokens.kt b/app/src/main/java/com/hippo/ehviewer/ui/settings/PreferenceTokens.kt deleted file mode 100644 index bbdd7ca98..000000000 --- a/app/src/main/java/com/hippo/ehviewer/ui/settings/PreferenceTokens.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.hippo.ehviewer.ui.settings - -import androidx.compose.ui.unit.dp - -object PreferenceTokens { - val PreferenceHeaderHeight = 56.dp - val PreferenceIconSize = 24.dp - val PreferenceIconPadding = 16.dp - val PreferenceTextPadding = 8.dp -} diff --git a/app/src/main/java/com/hippo/ehviewer/ui/settings/PreferenceWidgets.kt b/app/src/main/java/com/hippo/ehviewer/ui/settings/PreferenceWidgets.kt index bc1c32e6a..cfd4cb4d7 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/settings/PreferenceWidgets.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/settings/PreferenceWidgets.kt @@ -28,6 +28,7 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringArrayResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.AnnotatedString +import androidx.compose.ui.unit.dp import com.hippo.ehviewer.ui.login.LocalNavController import com.hippo.ehviewer.ui.openBrowser import com.hippo.ehviewer.ui.settings.PreferenceTokens.PreferenceTextPadding @@ -39,6 +40,13 @@ import com.jamal.composeprefs3.ui.prefs.TextPref import kotlin.math.roundToInt import kotlin.reflect.KMutableProperty0 +object PreferenceTokens { + val PreferenceHeaderHeight = 56.dp + val PreferenceIconSize = 24.dp + val PreferenceIconPadding = 16.dp + val PreferenceTextPadding = 8.dp +} + @Composable fun PreferenceHeader(icon: Painter, @StringRes title: Int, childRouteName: String) { val navController = LocalNavController.current