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 @@
+
+
+
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 @@
%1$s 回复
回复
首页滑动切换页面
+ 搜索页面显示贴吧话题
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" />
+
+
+
+