From 56de696330101c26316b2d102108e801e950fc69 Mon Sep 17 00:00:00 2001 From: tarsin Date: Thu, 4 May 2023 21:05:05 +0800 Subject: [PATCH] Workaround #1056 --- .../java/com/hippo/ehviewer/ui/fragment/EhFragment.kt | 11 +++++++++++ app/src/main/res/values-zh-rCN/strings.xml | 2 ++ app/src/main/res/values/strings.xml | 2 ++ app/src/main/res/xml/eh_settings.xml | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/EhFragment.kt b/app/src/main/java/com/hippo/ehviewer/ui/fragment/EhFragment.kt index c0f4b8d1c..b2dfce740 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/EhFragment.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/EhFragment.kt @@ -30,6 +30,7 @@ import com.google.android.material.timepicker.TimeFormat.CLOCK_12H import com.google.android.material.timepicker.TimeFormat.CLOCK_24H import com.hippo.ehviewer.R import com.hippo.ehviewer.Settings +import com.hippo.ehviewer.Settings.INVALID_DEFAULT_FAV_SLOT import com.hippo.ehviewer.client.EhCookieStore import com.hippo.ehviewer.client.EhEngine import com.hippo.ehviewer.client.EhTagDatabase @@ -52,6 +53,16 @@ class EhFragment : BasePreferenceFragment() { val thumbResolution = findPreference(Settings.KEY_THUMB_RESOLUTION) val showTagTranslations = findPreference(Settings.KEY_SHOW_TAG_TRANSLATIONS) val tagTranslationsSource = findPreference(Settings.KEY_TAG_TRANSLATIONS_SOURCE) + + /* Workaround https://github.com/Ehviewer-Overhauled/Ehviewer/issues/1056 + * Currently no elegant way to implement a longclickable Compose Button + */ + findPreference("reset_default_fav")!!.setOnPreferenceClickListener { + Settings.putDefaultFavSlot(INVALID_DEFAULT_FAV_SLOT) + true + } + + Settings.displayName?.let { account?.summary = it } theme!!.onPreferenceChangeListener = this gallerySite!!.onPreferenceChangeListener = this diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 51c6f23ce..1159b2d5f 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -627,4 +627,6 @@ 使用Display P3色彩空间 设置请求新闻页面的时间 + + 重置默认收藏夹 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7f3a5c64a..ab7dc3969 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -690,4 +690,6 @@ Use Display P3 color space Set time to request news + + Reset default favcat diff --git a/app/src/main/res/xml/eh_settings.xml b/app/src/main/res/xml/eh_settings.xml index 009d8ed61..ed7623fe5 100644 --- a/app/src/main/res/xml/eh_settings.xml +++ b/app/src/main/res/xml/eh_settings.xml @@ -184,4 +184,9 @@ app:dependency="request_news" app:iconSpaceReserved="false" /> + +