From 97c65648fd351c31f6f1a7eb5232d8ac8af2070f Mon Sep 17 00:00:00 2001
From: HuanChengFly <609486518@qq.com>
Date: Mon, 1 Feb 2021 18:43:53 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=9A=90=E8=97=8F=E8=B4=B4=E5=90=A7?=
 =?UTF-8?q?=E8=AF=9D=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../huanchengfly/tieba/post/activities/NewSearchActivity.kt | 3 +++
 .../huanchengfly/tieba/post/utils/AppPreferencesUtils.kt    | 4 ++--
 app/src/main/res/values/strings.xml                         | 2 +-
 app/src/main/res/xml/preferences.xml                        | 6 +++---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/huanchengfly/tieba/post/activities/NewSearchActivity.kt b/app/src/main/java/com/huanchengfly/tieba/post/activities/NewSearchActivity.kt
index 5db12bcc..4e47496f 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/activities/NewSearchActivity.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/activities/NewSearchActivity.kt
@@ -181,6 +181,9 @@ class NewSearchActivity : BaseActivity(), TabLayout.OnTabSelectedListener {
     }
 
     private fun loadHotTopic() {
+        if (appPreferences.hideHotMessageList) {
+            return
+        }
         if (hotMessageListBean != null) {
             addHotTopicAdapters(hotMessageListBean!!)
         } else {
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/utils/AppPreferencesUtils.kt b/app/src/main/java/com/huanchengfly/tieba/post/utils/AppPreferencesUtils.kt
index 7605b987..524216ba 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/utils/AppPreferencesUtils.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/utils/AppPreferencesUtils.kt
@@ -32,6 +32,8 @@ open class AppPreferencesUtils(context: Context) {
 
     var hideExplore by SharedPreferenceDelegates.boolean(defaultValue = false)
 
+    var hideHotMessageList by SharedPreferenceDelegates.boolean(defaultValue = false)
+
     var homePageScroll by SharedPreferenceDelegates.boolean(defaultValue = false)
 
     var imageLoadType by SharedPreferenceDelegates.string(key = "image_load_type", defaultValue = "0")
@@ -50,8 +52,6 @@ open class AppPreferencesUtils(context: Context) {
 
     var showBothUsernameAndNickname by SharedPreferenceDelegates.boolean(defaultValue = false, key = "show_both_username_and_nickname")
 
-    var showHotMessageList by SharedPreferenceDelegates.boolean(defaultValue = true)
-
     var showShortcutInThread by SharedPreferenceDelegates.boolean(defaultValue = true)
 
     var showTopForumInNormalList by SharedPreferenceDelegates.boolean(defaultValue = true, key = "show_top_forum_in_normal_list")
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c70bd6c5..9f38a562 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -421,5 +421,5 @@
     <string name="btn_reply_post">%1$s 回复</string>
     <string name="btn_reply_post_default">回复</string>
     <string name="title_home_page_scroll">首页滑动切换页面</string>
-    <string name="title_show_hot_message_list">搜索页面显示贴吧话题</string>
+    <string name="title_hide_hot_message_list">隐藏贴吧话题</string>
 </resources>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index bed9737b..0c08a1c5 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -110,9 +110,9 @@
 
         <SwitchPreference
             android:icon="@drawable/ic_round_whatshot"
-            android:defaultValue="true"
-            android:key="showHotMessageList"
-            android:title="@string/title_show_hot_message_list" />
+            android:defaultValue="false"
+            android:key="hideHotMessageList"
+            android:title="@string/title_hide_hot_message_list" />
 
         <Preference
             android:enabled="false"