From 1ac4c9bee86cce8f5aef04faa0e2e25d111c6d15 Mon Sep 17 00:00:00 2001
From: HuanChengFly <609486518@qq.com>
Date: Mon, 1 Feb 2021 18:41:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=A6=96=E9=A1=B5=E5=8F=AF=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=98=AF=E5=90=A6=E5=BC=80=E5=90=AF=E6=BB=91=E5=8A=A8?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tieba/post/activities/MainActivity.kt            |  2 +-
 .../tieba/post/utils/AppPreferencesUtils.kt          |  4 ++++
 app/src/main/res/drawable/ic_round_whatshot.xml      |  9 +++++++++
 app/src/main/res/values/strings.xml                  |  1 +
 app/src/main/res/xml/preferences.xml                 | 12 ++++++++++++
 5 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/drawable/ic_round_whatshot.xml

diff --git a/app/src/main/java/com/huanchengfly/tieba/post/activities/MainActivity.kt b/app/src/main/java/com/huanchengfly/tieba/post/activities/MainActivity.kt
index b35c4c8b..e53776ab 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/activities/MainActivity.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/activities/MainActivity.kt
@@ -142,7 +142,7 @@ open class MainActivity : BaseActivity(), BottomNavigationView.OnNavigationItemS
         }
         mAdapter.addFragment(MessageFragment.newInstance(MessageFragment.TYPE_REPLY_ME, true))
         mAdapter.addFragment(MyInfoFragment())
-        mViewPager.isCanScroll = false
+        mViewPager.isCanScroll = appPreferences.homePageScroll
         mViewPager.adapter = mAdapter
         mViewPager.offscreenPageLimit = mAdapter.count
     }
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 bfb32c12..7605b987 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 homePageScroll by SharedPreferenceDelegates.boolean(defaultValue = false)
+
     var imageLoadType by SharedPreferenceDelegates.string(key = "image_load_type", defaultValue = "0")
 
     var listSingle by SharedPreferenceDelegates.boolean(defaultValue = false)
@@ -48,6 +50,8 @@ 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/drawable/ic_round_whatshot.xml b/app/src/main/res/drawable/ic_round_whatshot.xml
new file mode 100644
index 00000000..e0b9899b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_round_whatshot.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M10.46,2.12c-4.06,0.61 -7.4,3.77 -8.24,7.8c-0.47,2.26 -0.15,4.41 0.7,6.26l4.37,-4.37c0.37,-0.37 0.95,-0.39 1.35,-0.06l2.3,1.92l3.35,-3.35l-0.59,-0.59C13.08,9.08 13.52,8 14.41,8H17c0.55,0 1,0.45 1,1v2.59c0,0.89 -1.08,1.34 -1.71,0.71l-0.59,-0.59l-4,4c-0.36,0.36 -0.95,0.39 -1.34,0.06l-2.31,-1.91l-4.08,4.08c2.08,2.8 5.57,4.49 9.43,3.96c4.52,-0.61 8.12,-4.37 8.56,-8.91C22.58,6.51 17,1.14 10.46,2.12z" />
+</vector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bcaa1e3c..c70bd6c5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -421,4 +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>
 </resources>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index c0455723..bed9737b 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -102,6 +102,18 @@
             android:key="loadPictureWhenScroll"
             android:title="@string/title_load_picture_when_scroll" />
 
+        <SwitchPreference
+            android:icon="@drawable/ic_round_view_carousel_white"
+            android:defaultValue="false"
+            android:key="homePageScroll"
+            android:title="@string/title_home_page_scroll" />
+
+        <SwitchPreference
+            android:icon="@drawable/ic_round_whatshot"
+            android:defaultValue="true"
+            android:key="showHotMessageList"
+            android:title="@string/title_show_hot_message_list" />
+
         <Preference
             android:enabled="false"
             android:layout="@layout/layout_preference_bottom" />