From 1079e4a7598aba3bee9cc4374ca4a413547918d0 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Thu, 1 Jun 2023 17:40:44 +0800
Subject: [PATCH] Sort preferences by type

---
 .../main/java/com/hippo/ehviewer/Settings.kt  | 41 ++++++++++---------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/Settings.kt b/app/src/main/java/com/hippo/ehviewer/Settings.kt
index ed8b9dcc3..9a6a659c5 100755
--- a/app/src/main/java/com/hippo/ehviewer/Settings.kt
+++ b/app/src/main/java/com/hippo/ehviewer/Settings.kt
@@ -425,7 +425,6 @@ object Settings : DefaultPreferences() {
             return size
         }
 
-    val thumbSizeDp by intPref(KEY_THUMB_SIZE, DEFAULT_THUMB_SIZE)
     val showComments by boolPref(KEY_SHOW_COMMENTS, DEFAULT_SHOW_COMMENTS)
     val requestNews by boolPref(KEY_REQUEST_NEWS, DEFAULT_REQUEST_NEWS)
     val hideHvEvents by boolPref(KEY_HIDE_HV_EVENTS, DEFAULT_HIDE_HV_EVENTS)
@@ -436,33 +435,37 @@ object Settings : DefaultPreferences() {
     var appLinkVerifyTip by boolPref(KEY_APP_LINK_VERIFY_TIP, DEFAULT_APP_LINK_VERIFY_TIP)
     val enabledSecurity by boolPref(KEY_SEC_SECURITY, VALUE_SEC_SECURITY)
     val mediaScan by boolPref(KEY_MEDIA_SCAN, DEFAULT_MEDIA_SCAN)
-    var recentDownloadLabel by stringOrNullPref(KEY_RECENT_DOWNLOAD_LABEL, DEFAULT_RECENT_DOWNLOAD_LABEL)
     var hasDefaultDownloadLabel by boolPref(KEY_HAS_DEFAULT_DOWNLOAD_LABEL, DEFAULT_HAS_DOWNLOAD_LABEL)
-    var defaultDownloadLabel by stringOrNullPref(KEY_DEFAULT_DOWNLOAD_LABEL, DEFAULT_DOWNLOAD_LABEL)
-    val downloadOriginImage by boolPref(KEY_DOWNLOAD_ORIGIN_IMAGE, DEFAULT_DOWNLOAD_ORIGIN_IMAGE)
-    var favLocalCount by intPref(KEY_FAV_LOCAL, DEFAULT_FAV_COUNT)
-    var favCloudCount by intPref(KEY_FAV_CLOUD, DEFAULT_FAV_COUNT)
-    var recentFavCat by intPref(KEY_RECENT_FAV_CAT, DEFAULT_RECENT_FAV_CAT)
-    var defaultFavSlot by intPref(KEY_DEFAULT_FAV_SLOT, DEFAULT_DEFAULT_FAV_SLOT)
     var qSSaveProgress by boolPref(KEY_QS_SAVE_PROGRESS, DEFAULT_QS_SAVE_PROGRESS)
     val saveParseErrorBody by boolPref(KEY_SAVE_PARSE_ERROR_BODY, DEFAULT_SAVE_PARSE_ERROR_BODY)
     val saveCrashLog by boolPref(KEY_SAVE_CRASH_LOG, DEFAULT_SAVE_CRASH_LOG)
     var security by boolPref(KEY_SECURITY, false)
-    val securityDelay by intPref(KEY_SECURITY_DELAY, 0)
     var builtInHosts by boolPref(KEY_BUILT_IN_HOSTS, DEFAULT_BUILT_IN_HOSTS)
-    var dF by boolPref(KEY_DOMAIN_FRONTING, DEFAULT_FRONTING)
-    var dohUrl by stringPref(KEY_DOH_URL, "")
-    val bypassVpn by boolPref(KEY_BYPASS_VPN, DEFAULT_BYPASS_VPN)
-    var proxyType by intPref(KEY_PROXY_TYPE, DEFAULT_PROXY_TYPE)
-    var proxyIp by stringOrNullPref(KEY_PROXY_IP, DEFAULT_PROXY_IP)
-    var proxyPort by intPref(KEY_PROXY_PORT, DEFAULT_PROXY_PORT)
-    var clipboardTextHashCode by intPref(KEY_CLIPBOARD_TEXT_HASH_CODE, DEFAULT_CLIPBOARD_TEXT_HASH_CODE)
-    var lastDawnDay by longPref(KEY_LAST_DAWN_DAY, 0)
-    var displayName by stringOrNullPref(KEY_DISPLAY_NAME, DEFAULT_DISPLAY_NAME)
-    var avatar by stringOrNullPref(KEY_AVATAR, null)
     var removeImageFiles by boolPref(KEY_REMOVE_IMAGE_FILES, DEFAULT_REMOVE_IMAGE_FILES)
     var needSignIn by boolPref(KEY_NEED_SIGN_IN, DEFAULT_NEED_SIGN_IN)
     var selectSite by boolPref(KEY_SELECT_SITE, DEFAULT_SELECT_SITE)
     val blackDarkTheme by boolPref(KEY_BLACK_DARK_THEME, DEFAULT_BLACK_DARK_THEME)
     val preloadThumbAggressively by boolPref(KEY_PRELOAD_THUMB_AGGRESIVELY, DEFAULT_PRELOAD_THUMB_AGGRESIVELY)
+    var dF by boolPref(KEY_DOMAIN_FRONTING, DEFAULT_FRONTING)
+    val downloadOriginImage by boolPref(KEY_DOWNLOAD_ORIGIN_IMAGE, DEFAULT_DOWNLOAD_ORIGIN_IMAGE)
+    val bypassVpn by boolPref(KEY_BYPASS_VPN, DEFAULT_BYPASS_VPN)
+
+    val thumbSizeDp by intPref(KEY_THUMB_SIZE, DEFAULT_THUMB_SIZE)
+    var favLocalCount by intPref(KEY_FAV_LOCAL, DEFAULT_FAV_COUNT)
+    var favCloudCount by intPref(KEY_FAV_CLOUD, DEFAULT_FAV_COUNT)
+    var recentFavCat by intPref(KEY_RECENT_FAV_CAT, DEFAULT_RECENT_FAV_CAT)
+    var defaultFavSlot by intPref(KEY_DEFAULT_FAV_SLOT, DEFAULT_DEFAULT_FAV_SLOT)
+    val securityDelay by intPref(KEY_SECURITY_DELAY, 0)
+    var proxyType by intPref(KEY_PROXY_TYPE, DEFAULT_PROXY_TYPE)
+    var proxyPort by intPref(KEY_PROXY_PORT, DEFAULT_PROXY_PORT)
+    var clipboardTextHashCode by intPref(KEY_CLIPBOARD_TEXT_HASH_CODE, DEFAULT_CLIPBOARD_TEXT_HASH_CODE)
+
+    var recentDownloadLabel by stringOrNullPref(KEY_RECENT_DOWNLOAD_LABEL, DEFAULT_RECENT_DOWNLOAD_LABEL)
+    var defaultDownloadLabel by stringOrNullPref(KEY_DEFAULT_DOWNLOAD_LABEL, DEFAULT_DOWNLOAD_LABEL)
+    var displayName by stringOrNullPref(KEY_DISPLAY_NAME, DEFAULT_DISPLAY_NAME)
+    var avatar by stringOrNullPref(KEY_AVATAR, null)
+    var proxyIp by stringOrNullPref(KEY_PROXY_IP, DEFAULT_PROXY_IP)
+
+    var dohUrl by stringPref(KEY_DOH_URL, "")
+    var lastDawnDay by longPref(KEY_LAST_DAWN_DAY, 0)
 }